Commit 54d18992 authored by Hans Leidekker's avatar Hans Leidekker Committed by Alexandre Julliard

wldap32: Win64 printf format warning fixes.

parent 6ea5f656
...@@ -6,7 +6,6 @@ MODULE = wldap32.dll ...@@ -6,7 +6,6 @@ MODULE = wldap32.dll
IMPORTLIB = libwldap32.$(IMPLIBEXT) IMPORTLIB = libwldap32.$(IMPLIBEXT)
IMPORTS = user32 kernel32 IMPORTS = user32 kernel32
EXTRALIBS = @LDAPLIBS@ EXTRALIBS = @LDAPLIBS@
EXTRADEFS = -DWINE_NO_LONG_AS_INT
C_SRCS = \ C_SRCS = \
add.c \ add.c \
......
...@@ -54,7 +54,7 @@ ULONG CDECL ldap_bindA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR cred, ULONG method ) ...@@ -54,7 +54,7 @@ ULONG CDECL ldap_bindA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR cred, ULONG method )
ret = WLDAP32_LDAP_NO_MEMORY; ret = WLDAP32_LDAP_NO_MEMORY;
TRACE( "(%p, %s, %p, 0x%08lx)\n", ld, debugstr_a(dn), cred, method ); TRACE( "(%p, %s, %p, 0x%08x)\n", ld, debugstr_a(dn), cred, method );
if (!ld) return ~0UL; if (!ld) return ~0UL;
...@@ -105,7 +105,7 @@ ULONG CDECL ldap_bindW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR cred, ULONG method ) ...@@ -105,7 +105,7 @@ ULONG CDECL ldap_bindW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR cred, ULONG method )
ret = WLDAP32_LDAP_NO_MEMORY; ret = WLDAP32_LDAP_NO_MEMORY;
TRACE( "(%p, %s, %p, 0x%08lx)\n", ld, debugstr_w(dn), cred, method ); TRACE( "(%p, %s, %p, 0x%08x)\n", ld, debugstr_w(dn), cred, method );
if (!ld) return ~0UL; if (!ld) return ~0UL;
if (method != LDAP_AUTH_SIMPLE) return WLDAP32_LDAP_PARAM_ERROR; if (method != LDAP_AUTH_SIMPLE) return WLDAP32_LDAP_PARAM_ERROR;
...@@ -150,7 +150,7 @@ ULONG CDECL ldap_bind_sA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR cred, ULONG method ) ...@@ -150,7 +150,7 @@ ULONG CDECL ldap_bind_sA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR cred, ULONG method )
ret = WLDAP32_LDAP_NO_MEMORY; ret = WLDAP32_LDAP_NO_MEMORY;
TRACE( "(%p, %s, %p, 0x%08lx)\n", ld, debugstr_a(dn), cred, method ); TRACE( "(%p, %s, %p, 0x%08x)\n", ld, debugstr_a(dn), cred, method );
if (!ld) return WLDAP32_LDAP_PARAM_ERROR; if (!ld) return WLDAP32_LDAP_PARAM_ERROR;
...@@ -197,7 +197,7 @@ ULONG CDECL ldap_bind_sW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR cred, ULONG method ...@@ -197,7 +197,7 @@ ULONG CDECL ldap_bind_sW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR cred, ULONG method
ret = WLDAP32_LDAP_NO_MEMORY; ret = WLDAP32_LDAP_NO_MEMORY;
TRACE( "(%p, %s, %p, 0x%08lx)\n", ld, debugstr_w(dn), cred, method ); TRACE( "(%p, %s, %p, 0x%08x)\n", ld, debugstr_w(dn), cred, method );
if (!ld) return WLDAP32_LDAP_PARAM_ERROR; if (!ld) return WLDAP32_LDAP_PARAM_ERROR;
if (method != LDAP_AUTH_SIMPLE) return WLDAP32_LDAP_PARAM_ERROR; if (method != LDAP_AUTH_SIMPLE) return WLDAP32_LDAP_PARAM_ERROR;
......
...@@ -113,7 +113,7 @@ PCHAR * CDECL ldap_explode_dnA( PCHAR dn, ULONG notypes ) ...@@ -113,7 +113,7 @@ PCHAR * CDECL ldap_explode_dnA( PCHAR dn, ULONG notypes )
#ifdef HAVE_LDAP #ifdef HAVE_LDAP
WCHAR *dnW, **retW; WCHAR *dnW, **retW;
TRACE( "(%s, 0x%08lx)\n", debugstr_a(dn), notypes ); TRACE( "(%s, 0x%08x)\n", debugstr_a(dn), notypes );
dnW = strAtoW( dn ); dnW = strAtoW( dn );
if (!dnW) return NULL; if (!dnW) return NULL;
...@@ -151,7 +151,7 @@ PWCHAR * CDECL ldap_explode_dnW( PWCHAR dn, ULONG notypes ) ...@@ -151,7 +151,7 @@ PWCHAR * CDECL ldap_explode_dnW( PWCHAR dn, ULONG notypes )
#ifdef HAVE_LDAP #ifdef HAVE_LDAP
char *dnU, **retU; char *dnU, **retU;
TRACE( "(%s, 0x%08lx)\n", debugstr_w(dn), notypes ); TRACE( "(%s, 0x%08x)\n", debugstr_w(dn), notypes );
dnU = strWtoU( dn ); dnU = strWtoU( dn );
if (!dnU) return NULL; if (!dnU) return NULL;
......
...@@ -53,7 +53,7 @@ PCHAR CDECL ldap_err2stringA( ULONG err ) ...@@ -53,7 +53,7 @@ PCHAR CDECL ldap_err2stringA( ULONG err )
{ {
static char buf[256] = ""; static char buf[256] = "";
TRACE( "(0x%08lx)\n", err ); TRACE( "(0x%08x)\n", err );
if (err <= WLDAP32_LDAP_REFERRAL_LIMIT_EXCEEDED) if (err <= WLDAP32_LDAP_REFERRAL_LIMIT_EXCEEDED)
LoadStringA( hwldap32, err, buf, 256 ); LoadStringA( hwldap32, err, buf, 256 );
...@@ -83,7 +83,7 @@ PWCHAR CDECL ldap_err2stringW( ULONG err ) ...@@ -83,7 +83,7 @@ PWCHAR CDECL ldap_err2stringW( ULONG err )
{ {
static WCHAR buf[256] = { 0 }; static WCHAR buf[256] = { 0 };
TRACE( "(0x%08lx)\n", err ); TRACE( "(0x%08x)\n", err );
if (err <= WLDAP32_LDAP_REFERRAL_LIMIT_EXCEEDED) if (err <= WLDAP32_LDAP_REFERRAL_LIMIT_EXCEEDED)
LoadStringW( hwldap32, err, buf, 256 ); LoadStringW( hwldap32, err, buf, 256 );
...@@ -136,7 +136,7 @@ ULONG CDECL WLDAP32_ldap_result2error( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *re ...@@ -136,7 +136,7 @@ ULONG CDECL WLDAP32_ldap_result2error( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *re
#ifdef HAVE_LDAP #ifdef HAVE_LDAP
int error; int error;
TRACE( "(%p, %p, 0x%08lx)\n", ld, res, free ); TRACE( "(%p, %p, 0x%08x)\n", ld, res, free );
if (!ld || !res) return ~0UL; if (!ld || !res) return ~0UL;
...@@ -282,7 +282,7 @@ static const ULONG WLDAP32_errormap[] = { ...@@ -282,7 +282,7 @@ static const ULONG WLDAP32_errormap[] = {
*/ */
ULONG CDECL LdapMapErrorToWin32( ULONG err ) ULONG CDECL LdapMapErrorToWin32( ULONG err )
{ {
TRACE( "(0x%08lx)\n", err ); TRACE( "(0x%08x)\n", err );
if (err >= sizeof(WLDAP32_errormap)/sizeof(WLDAP32_errormap[0])) if (err >= sizeof(WLDAP32_errormap)/sizeof(WLDAP32_errormap[0]))
return ERROR_DS_GENERIC_ERROR; return ERROR_DS_GENERIC_ERROR;
......
...@@ -60,7 +60,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wldap32); ...@@ -60,7 +60,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
*/ */
ULONG CDECL ldap_close_extended_op( WLDAP32_LDAP *ld, ULONG msgid ) ULONG CDECL ldap_close_extended_op( WLDAP32_LDAP *ld, ULONG msgid )
{ {
TRACE( "(%p, 0x%08lx)\n", ld, msgid ); TRACE( "(%p, 0x%08x)\n", ld, msgid );
if (!ld) return WLDAP32_LDAP_PARAM_ERROR; if (!ld) return WLDAP32_LDAP_PARAM_ERROR;
return LDAP_SUCCESS; return LDAP_SUCCESS;
......
...@@ -136,7 +136,7 @@ static char *join_hostnames( const char *scheme, char **hostnames, ULONG portnum ...@@ -136,7 +136,7 @@ static char *join_hostnames( const char *scheme, char **hostnames, ULONG portnum
{ {
char *res, *p, *q, **v; char *res, *p, *q, **v;
unsigned int i = 0, size = 0; unsigned int i = 0, size = 0;
static const char sep[] = " ", fmt[] = ":%ld"; static const char sep[] = " ", fmt[] = ":%d";
char port[7]; char port[7];
sprintf( port, fmt, portnumber ); sprintf( port, fmt, portnumber );
...@@ -224,7 +224,7 @@ WLDAP32_LDAP * CDECL cldap_openA( PCHAR hostname, ULONG portnumber ) ...@@ -224,7 +224,7 @@ WLDAP32_LDAP * CDECL cldap_openA( PCHAR hostname, ULONG portnumber )
WLDAP32_LDAP *ld = NULL; WLDAP32_LDAP *ld = NULL;
WCHAR *hostnameW = NULL; WCHAR *hostnameW = NULL;
TRACE( "(%s, %ld)\n", debugstr_a(hostname), portnumber ); TRACE( "(%s, %d)\n", debugstr_a(hostname), portnumber );
if (hostname) { if (hostname) {
hostnameW = strAtoW( hostname ); hostnameW = strAtoW( hostname );
...@@ -268,7 +268,7 @@ WLDAP32_LDAP * CDECL cldap_openW( PWCHAR hostname, ULONG portnumber ) ...@@ -268,7 +268,7 @@ WLDAP32_LDAP * CDECL cldap_openW( PWCHAR hostname, ULONG portnumber )
LDAP *ld = NULL; LDAP *ld = NULL;
char *hostnameU = NULL, *url = NULL; char *hostnameU = NULL, *url = NULL;
TRACE( "(%s, %ld)\n", debugstr_w(hostname), portnumber ); TRACE( "(%s, %d)\n", debugstr_w(hostname), portnumber );
if (hostname) { if (hostname) {
hostnameU = strWtoU( hostname ); hostnameU = strWtoU( hostname );
...@@ -330,7 +330,7 @@ WLDAP32_LDAP * CDECL ldap_initA( PCHAR hostname, ULONG portnumber ) ...@@ -330,7 +330,7 @@ WLDAP32_LDAP * CDECL ldap_initA( PCHAR hostname, ULONG portnumber )
WLDAP32_LDAP *ld = NULL; WLDAP32_LDAP *ld = NULL;
WCHAR *hostnameW = NULL; WCHAR *hostnameW = NULL;
TRACE( "(%s, %ld)\n", debugstr_a(hostname), portnumber ); TRACE( "(%s, %d)\n", debugstr_a(hostname), portnumber );
if (hostname) { if (hostname) {
hostnameW = strAtoW( hostname ); hostnameW = strAtoW( hostname );
...@@ -375,7 +375,7 @@ WLDAP32_LDAP * CDECL ldap_initW( PWCHAR hostname, ULONG portnumber ) ...@@ -375,7 +375,7 @@ WLDAP32_LDAP * CDECL ldap_initW( PWCHAR hostname, ULONG portnumber )
LDAP *ld = NULL; LDAP *ld = NULL;
char *hostnameU = NULL, *url = NULL; char *hostnameU = NULL, *url = NULL;
TRACE( "(%s, %ld)\n", debugstr_w(hostname), portnumber ); TRACE( "(%s, %d)\n", debugstr_w(hostname), portnumber );
if (hostname) { if (hostname) {
hostnameU = strWtoU( hostname ); hostnameU = strWtoU( hostname );
...@@ -411,7 +411,7 @@ WLDAP32_LDAP * CDECL ldap_openA( PCHAR hostname, ULONG portnumber ) ...@@ -411,7 +411,7 @@ WLDAP32_LDAP * CDECL ldap_openA( PCHAR hostname, ULONG portnumber )
WLDAP32_LDAP *ld = NULL; WLDAP32_LDAP *ld = NULL;
WCHAR *hostnameW = NULL; WCHAR *hostnameW = NULL;
TRACE( "(%s, %ld)\n", debugstr_a(hostname), portnumber ); TRACE( "(%s, %d)\n", debugstr_a(hostname), portnumber );
if (hostname) { if (hostname) {
hostnameW = strAtoW( hostname ); hostnameW = strAtoW( hostname );
...@@ -455,7 +455,7 @@ WLDAP32_LDAP * CDECL ldap_openW( PWCHAR hostname, ULONG portnumber ) ...@@ -455,7 +455,7 @@ WLDAP32_LDAP * CDECL ldap_openW( PWCHAR hostname, ULONG portnumber )
LDAP *ld = NULL; LDAP *ld = NULL;
char *hostnameU = NULL, *url = NULL; char *hostnameU = NULL, *url = NULL;
TRACE( "(%s, %ld)\n", debugstr_w(hostname), portnumber ); TRACE( "(%s, %d)\n", debugstr_w(hostname), portnumber );
if (hostname) { if (hostname) {
hostnameU = strWtoU( hostname ); hostnameU = strWtoU( hostname );
...@@ -491,7 +491,7 @@ WLDAP32_LDAP * CDECL ldap_sslinitA( PCHAR hostname, ULONG portnumber, int secure ...@@ -491,7 +491,7 @@ WLDAP32_LDAP * CDECL ldap_sslinitA( PCHAR hostname, ULONG portnumber, int secure
WLDAP32_LDAP *ld; WLDAP32_LDAP *ld;
WCHAR *hostnameW = NULL; WCHAR *hostnameW = NULL;
TRACE( "(%s, %ld, 0x%08x)\n", debugstr_a(hostname), portnumber, secure ); TRACE( "(%s, %d, 0x%08x)\n", debugstr_a(hostname), portnumber, secure );
if (hostname) { if (hostname) {
hostnameW = strAtoW( hostname ); hostnameW = strAtoW( hostname );
...@@ -536,7 +536,7 @@ WLDAP32_LDAP * CDECL ldap_sslinitW( PWCHAR hostname, ULONG portnumber, int secur ...@@ -536,7 +536,7 @@ WLDAP32_LDAP * CDECL ldap_sslinitW( PWCHAR hostname, ULONG portnumber, int secur
WLDAP32_LDAP *ld = NULL; WLDAP32_LDAP *ld = NULL;
char *hostnameU = NULL, *url = NULL; char *hostnameU = NULL, *url = NULL;
TRACE( "(%s, %ld, 0x%08x)\n", debugstr_w(hostname), portnumber, secure ); TRACE( "(%s, %d, 0x%08x)\n", debugstr_w(hostname), portnumber, secure );
if (hostname) { if (hostname) {
hostnameU = strWtoU( hostname ); hostnameU = strWtoU( hostname );
......
...@@ -32,7 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wldap32); ...@@ -32,7 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
{ {
TRACE( "(%p, %ld, %p)\n", hinst, reason, reserved ); TRACE( "(%p, %d, %p)\n", hinst, reason, reserved );
switch (reason) switch (reason)
{ {
......
...@@ -60,7 +60,7 @@ ULONG CDECL WLDAP32_ldap_abandon( WLDAP32_LDAP *ld, ULONG msgid ) ...@@ -60,7 +60,7 @@ ULONG CDECL WLDAP32_ldap_abandon( WLDAP32_LDAP *ld, ULONG msgid )
ULONG ret = LDAP_NOT_SUPPORTED; ULONG ret = LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP #ifdef HAVE_LDAP
TRACE( "(%p, 0x%08lx)\n", ld, msgid ); TRACE( "(%p, 0x%08x)\n", ld, msgid );
if (!ld) return ~0UL; if (!ld) return ~0UL;
ret = ldap_abandon_ext( ld, msgid, NULL, NULL ); ret = ldap_abandon_ext( ld, msgid, NULL, NULL );
...@@ -248,7 +248,7 @@ ULONG CDECL ldap_escape_filter_elementA( PCHAR src, ULONG srclen, PCHAR dst, ULO ...@@ -248,7 +248,7 @@ ULONG CDECL ldap_escape_filter_elementA( PCHAR src, ULONG srclen, PCHAR dst, ULO
{ {
ULONG len; ULONG len;
TRACE( "(%p, 0x%08lx, %p, 0x%08lx)\n", src, srclen, dst, dstlen ); TRACE( "(%p, 0x%08x, %p, 0x%08x)\n", src, srclen, dst, dstlen );
len = get_escape_size( src, srclen ); len = get_escape_size( src, srclen );
if (!dst) return len; if (!dst) return len;
...@@ -281,7 +281,7 @@ ULONG CDECL ldap_escape_filter_elementW( PCHAR src, ULONG srclen, PWCHAR dst, UL ...@@ -281,7 +281,7 @@ ULONG CDECL ldap_escape_filter_elementW( PCHAR src, ULONG srclen, PWCHAR dst, UL
{ {
ULONG len; ULONG len;
TRACE( "(%p, 0x%08lx, %p, 0x%08lx)\n", src, srclen, dst, dstlen ); TRACE( "(%p, 0x%08x, %p, 0x%08x)\n", src, srclen, dst, dstlen );
len = get_escape_size( src, srclen ); len = get_escape_size( src, srclen );
if (!dst) return len; if (!dst) return len;
...@@ -611,7 +611,7 @@ ULONG CDECL WLDAP32_ldap_result( WLDAP32_LDAP *ld, ULONG msgid, ULONG all, ...@@ -611,7 +611,7 @@ ULONG CDECL WLDAP32_ldap_result( WLDAP32_LDAP *ld, ULONG msgid, ULONG all,
ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED; ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP #ifdef HAVE_LDAP
TRACE( "(%p, 0x%08lx, 0x%08lx, %p, %p)\n", ld, msgid, all, timeout, res ); TRACE( "(%p, 0x%08x, 0x%08x, %p, %p)\n", ld, msgid, all, timeout, res );
if (!ld || !res || msgid == ~0UL) return ~0UL; if (!ld || !res || msgid == ~0UL) return ~0UL;
ret = ldap_result( ld, msgid, all, (struct timeval *)timeout, res ); ret = ldap_result( ld, msgid, all, (struct timeval *)timeout, res );
......
...@@ -57,7 +57,7 @@ ULONG CDECL ldap_create_page_controlA( WLDAP32_LDAP *ld, ULONG pagesize, ...@@ -57,7 +57,7 @@ ULONG CDECL ldap_create_page_controlA( WLDAP32_LDAP *ld, ULONG pagesize,
#ifdef HAVE_LDAP #ifdef HAVE_LDAP
LDAPControlW *controlW = NULL; LDAPControlW *controlW = NULL;
TRACE( "(%p, 0x%08lx, %p, 0x%02x, %p)\n", ld, pagesize, cookie, TRACE( "(%p, 0x%08x, %p, 0x%02x, %p)\n", ld, pagesize, cookie,
critical, control ); critical, control );
if (!ld || !control || pagesize > LDAP_MAXINT) if (!ld || !control || pagesize > LDAP_MAXINT)
...@@ -152,7 +152,7 @@ ULONG CDECL ldap_create_page_controlW( WLDAP32_LDAP *ld, ULONG pagesize, ...@@ -152,7 +152,7 @@ ULONG CDECL ldap_create_page_controlW( WLDAP32_LDAP *ld, ULONG pagesize,
ULONG ret = LDAP_NOT_SUPPORTED; ULONG ret = LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP #ifdef HAVE_LDAP
TRACE( "(%p, 0x%08lx, %p, 0x%02x, %p)\n", ld, pagesize, cookie, TRACE( "(%p, 0x%08x, %p, 0x%02x, %p)\n", ld, pagesize, cookie,
critical, control ); critical, control );
if (!ld || !control || pagesize > LDAP_MAXINT) if (!ld || !control || pagesize > LDAP_MAXINT)
...@@ -167,7 +167,7 @@ ULONG CDECL ldap_create_page_controlW( WLDAP32_LDAP *ld, ULONG pagesize, ...@@ -167,7 +167,7 @@ ULONG CDECL ldap_create_page_controlW( WLDAP32_LDAP *ld, ULONG pagesize,
ULONG CDECL ldap_get_next_page( WLDAP32_LDAP *ld, PLDAPSearch search, ULONG pagesize, ULONG CDECL ldap_get_next_page( WLDAP32_LDAP *ld, PLDAPSearch search, ULONG pagesize,
ULONG *message ) ULONG *message )
{ {
FIXME( "(%p, %p, 0x%08lx, %p)\n", ld, search, pagesize, message ); FIXME( "(%p, %p, 0x%08x, %p)\n", ld, search, pagesize, message );
if (!ld) return ~0UL; if (!ld) return ~0UL;
return LDAP_NOT_SUPPORTED; return LDAP_NOT_SUPPORTED;
...@@ -177,7 +177,7 @@ ULONG CDECL ldap_get_next_page_s( WLDAP32_LDAP *ld, PLDAPSearch search, ...@@ -177,7 +177,7 @@ ULONG CDECL ldap_get_next_page_s( WLDAP32_LDAP *ld, PLDAPSearch search,
struct l_timeval *timeout, ULONG pagesize, ULONG *count, struct l_timeval *timeout, ULONG pagesize, ULONG *count,
WLDAP32_LDAPMessage **results ) WLDAP32_LDAPMessage **results )
{ {
FIXME( "(%p, %p, %p, 0x%08lx, %p, %p)\n", ld, search, timeout, FIXME( "(%p, %p, %p, 0x%08x, %p, %p)\n", ld, search, timeout,
pagesize, count, results ); pagesize, count, results );
if (!ld) return ~0UL; if (!ld) return ~0UL;
...@@ -278,7 +278,7 @@ PLDAPSearch CDECL ldap_search_init_pageA( WLDAP32_LDAP *ld, PCHAR dn, ULONG scop ...@@ -278,7 +278,7 @@ PLDAPSearch CDECL ldap_search_init_pageA( WLDAP32_LDAP *ld, PCHAR dn, ULONG scop
PCHAR filter, PCHAR attrs[], ULONG attrsonly, PLDAPControlA *serverctrls, PCHAR filter, PCHAR attrs[], ULONG attrsonly, PLDAPControlA *serverctrls,
PLDAPControlA *clientctrls, ULONG timelimit, ULONG sizelimit, PLDAPSortKeyA *sortkeys ) PLDAPControlA *clientctrls, ULONG timelimit, ULONG sizelimit, PLDAPSortKeyA *sortkeys )
{ {
FIXME( "(%p, %s, 0x%08lx, %s, %p, 0x%08lx)\n", ld, debugstr_a(dn), FIXME( "(%p, %s, 0x%08x, %s, %p, 0x%08x)\n", ld, debugstr_a(dn),
scope, debugstr_a(filter), attrs, attrsonly ); scope, debugstr_a(filter), attrs, attrsonly );
return NULL; return NULL;
} }
...@@ -287,7 +287,7 @@ PLDAPSearch CDECL ldap_search_init_pageW( WLDAP32_LDAP *ld, PWCHAR dn, ULONG sco ...@@ -287,7 +287,7 @@ PLDAPSearch CDECL ldap_search_init_pageW( WLDAP32_LDAP *ld, PWCHAR dn, ULONG sco
PWCHAR filter, PWCHAR attrs[], ULONG attrsonly, PLDAPControlW *serverctrls, PWCHAR filter, PWCHAR attrs[], ULONG attrsonly, PLDAPControlW *serverctrls,
PLDAPControlW *clientctrls, ULONG timelimit, ULONG sizelimit, PLDAPSortKeyW *sortkeys ) PLDAPControlW *clientctrls, ULONG timelimit, ULONG sizelimit, PLDAPSortKeyW *sortkeys )
{ {
FIXME( "(%p, %s, 0x%08lx, %s, %p, 0x%08lx)\n", ld, debugstr_w(dn), FIXME( "(%p, %s, 0x%08x, %s, %p, 0x%08x)\n", ld, debugstr_w(dn),
scope, debugstr_w(filter), attrs, attrsonly ); scope, debugstr_w(filter), attrs, attrsonly );
return NULL; return NULL;
} }
...@@ -325,6 +325,7 @@ ULONG CDECL ldap_parse_sort_controlW( WLDAP32_LDAP *ld, PLDAPControlW *control, ...@@ -325,6 +325,7 @@ ULONG CDECL ldap_parse_sort_controlW( WLDAP32_LDAP *ld, PLDAPControlW *control,
#ifdef HAVE_LDAP #ifdef HAVE_LDAP
char *attrU = NULL; char *attrU = NULL;
LDAPControl **controlU = NULL; LDAPControl **controlU = NULL;
unsigned long res;
TRACE( "(%p, %p, %p, %p)\n", ld, control, result, attr ); TRACE( "(%p, %p, %p, %p)\n", ld, control, result, attr );
...@@ -335,8 +336,9 @@ ULONG CDECL ldap_parse_sort_controlW( WLDAP32_LDAP *ld, PLDAPControlW *control, ...@@ -335,8 +336,9 @@ ULONG CDECL ldap_parse_sort_controlW( WLDAP32_LDAP *ld, PLDAPControlW *control,
if (!controlU) return WLDAP32_LDAP_NO_MEMORY; if (!controlU) return WLDAP32_LDAP_NO_MEMORY;
} }
ret = ldap_parse_sort_control( ld, controlU, result, &attrU ); ret = ldap_parse_sort_control( ld, controlU, &res, &attrU );
*result = res;
*attr = strUtoW( attrU ); *attr = strUtoW( attrU );
controlarrayfreeU( controlU ); controlarrayfreeU( controlU );
...@@ -403,6 +405,7 @@ INT CDECL ldap_parse_vlv_controlW( WLDAP32_LDAP *ld, PLDAPControlW *control, ...@@ -403,6 +405,7 @@ INT CDECL ldap_parse_vlv_controlW( WLDAP32_LDAP *ld, PLDAPControlW *control,
int ret = LDAP_NOT_SUPPORTED; int ret = LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP #ifdef HAVE_LDAP
LDAPControl **controlU = NULL; LDAPControl **controlU = NULL;
unsigned long pos, count;
TRACE( "(%p, %p, %p, %p, %p, %p)\n", ld, control, targetpos, TRACE( "(%p, %p, %p, %p, %p, %p)\n", ld, control, targetpos,
listcount, context, errcode ); listcount, context, errcode );
...@@ -414,9 +417,11 @@ INT CDECL ldap_parse_vlv_controlW( WLDAP32_LDAP *ld, PLDAPControlW *control, ...@@ -414,9 +417,11 @@ INT CDECL ldap_parse_vlv_controlW( WLDAP32_LDAP *ld, PLDAPControlW *control,
if (!controlU) return WLDAP32_LDAP_NO_MEMORY; if (!controlU) return WLDAP32_LDAP_NO_MEMORY;
} }
ret = ldap_parse_vlv_control( ld, controlU, targetpos, listcount, ret = ldap_parse_vlv_control( ld, controlU, &pos, &count,
(struct berval **)context, errcode ); (struct berval **)context, errcode );
*targetpos = pos;
*listcount = count;
controlarrayfreeU( controlU ); controlarrayfreeU( controlU );
#endif #endif
......
...@@ -55,7 +55,7 @@ ULONG CDECL ldap_searchA( WLDAP32_LDAP *ld, PCHAR base, ULONG scope, PCHAR filte ...@@ -55,7 +55,7 @@ ULONG CDECL ldap_searchA( WLDAP32_LDAP *ld, PCHAR base, ULONG scope, PCHAR filte
ret = WLDAP32_LDAP_NO_MEMORY; ret = WLDAP32_LDAP_NO_MEMORY;
TRACE( "(%p, %s, 0x%08lx, %s, %p, 0x%08lx)\n", ld, debugstr_a(base), TRACE( "(%p, %s, 0x%08x, %s, %p, 0x%08x)\n", ld, debugstr_a(base),
scope, debugstr_a(filter), attrs, attrsonly ); scope, debugstr_a(filter), attrs, attrsonly );
if (!ld) return ~0UL; if (!ld) return ~0UL;
...@@ -117,7 +117,7 @@ ULONG CDECL ldap_searchW( WLDAP32_LDAP *ld, PWCHAR base, ULONG scope, PWCHAR fil ...@@ -117,7 +117,7 @@ ULONG CDECL ldap_searchW( WLDAP32_LDAP *ld, PWCHAR base, ULONG scope, PWCHAR fil
ret = WLDAP32_LDAP_NO_MEMORY; ret = WLDAP32_LDAP_NO_MEMORY;
TRACE( "(%p, %s, 0x%08lx, %s, %p, 0x%08lx)\n", ld, debugstr_w(base), TRACE( "(%p, %s, 0x%08x, %s, %p, 0x%08x)\n", ld, debugstr_w(base),
scope, debugstr_w(filter), attrs, attrsonly ); scope, debugstr_w(filter), attrs, attrsonly );
if (!ld) return ~0UL; if (!ld) return ~0UL;
...@@ -168,7 +168,7 @@ ULONG CDECL ldap_search_extA( WLDAP32_LDAP *ld, PCHAR base, ULONG scope, ...@@ -168,7 +168,7 @@ ULONG CDECL ldap_search_extA( WLDAP32_LDAP *ld, PCHAR base, ULONG scope,
ret = WLDAP32_LDAP_NO_MEMORY; ret = WLDAP32_LDAP_NO_MEMORY;
TRACE( "(%p, %s, 0x%08lx, %s, %p, 0x%08lx, %p, %p, 0x%08lx, 0x%08lx, %p)\n", TRACE( "(%p, %s, 0x%08x, %s, %p, 0x%08x, %p, %p, 0x%08x, 0x%08x, %p)\n",
ld, debugstr_a(base), scope, debugstr_a(filter), attrs, attrsonly, ld, debugstr_a(base), scope, debugstr_a(filter), attrs, attrsonly,
serverctrls, clientctrls, timelimit, sizelimit, message ); serverctrls, clientctrls, timelimit, sizelimit, message );
...@@ -250,7 +250,7 @@ ULONG CDECL ldap_search_extW( WLDAP32_LDAP *ld, PWCHAR base, ULONG scope, ...@@ -250,7 +250,7 @@ ULONG CDECL ldap_search_extW( WLDAP32_LDAP *ld, PWCHAR base, ULONG scope,
ret = WLDAP32_LDAP_NO_MEMORY; ret = WLDAP32_LDAP_NO_MEMORY;
TRACE( "(%p, %s, 0x%08lx, %s, %p, 0x%08lx, %p, %p, 0x%08lx, 0x%08lx, %p)\n", TRACE( "(%p, %s, 0x%08x, %s, %p, 0x%08x, %p, %p, 0x%08x, 0x%08x, %p)\n",
ld, debugstr_w(base), scope, debugstr_w(filter), attrs, attrsonly, ld, debugstr_w(base), scope, debugstr_w(filter), attrs, attrsonly,
serverctrls, clientctrls, timelimit, sizelimit, message ); serverctrls, clientctrls, timelimit, sizelimit, message );
...@@ -310,7 +310,7 @@ ULONG CDECL ldap_search_ext_sA( WLDAP32_LDAP *ld, PCHAR base, ULONG scope, ...@@ -310,7 +310,7 @@ ULONG CDECL ldap_search_ext_sA( WLDAP32_LDAP *ld, PCHAR base, ULONG scope,
ret = WLDAP32_LDAP_NO_MEMORY; ret = WLDAP32_LDAP_NO_MEMORY;
TRACE( "(%p, %s, 0x%08lx, %s, %p, 0x%08lx, %p, %p, %p, 0x%08lx, %p)\n", TRACE( "(%p, %s, 0x%08x, %s, %p, 0x%08x, %p, %p, %p, 0x%08x, %p)\n",
ld, debugstr_a(base), scope, debugstr_a(filter), attrs, attrsonly, ld, debugstr_a(base), scope, debugstr_a(filter), attrs, attrsonly,
serverctrls, clientctrls, timeout, sizelimit, res ); serverctrls, clientctrls, timeout, sizelimit, res );
...@@ -388,7 +388,7 @@ ULONG CDECL ldap_search_ext_sW( WLDAP32_LDAP *ld, PWCHAR base, ULONG scope, ...@@ -388,7 +388,7 @@ ULONG CDECL ldap_search_ext_sW( WLDAP32_LDAP *ld, PWCHAR base, ULONG scope,
ret = WLDAP32_LDAP_NO_MEMORY; ret = WLDAP32_LDAP_NO_MEMORY;
TRACE( "(%p, %s, 0x%08lx, %s, %p, 0x%08lx, %p, %p, %p, 0x%08lx, %p)\n", TRACE( "(%p, %s, 0x%08x, %s, %p, 0x%08x, %p, %p, %p, 0x%08x, %p)\n",
ld, debugstr_w(base), scope, debugstr_w(filter), attrs, attrsonly, ld, debugstr_w(base), scope, debugstr_w(filter), attrs, attrsonly,
serverctrls, clientctrls, timeout, sizelimit, res ); serverctrls, clientctrls, timeout, sizelimit, res );
...@@ -443,7 +443,7 @@ ULONG CDECL ldap_search_sA( WLDAP32_LDAP *ld, PCHAR base, ULONG scope, PCHAR fil ...@@ -443,7 +443,7 @@ ULONG CDECL ldap_search_sA( WLDAP32_LDAP *ld, PCHAR base, ULONG scope, PCHAR fil
ret = WLDAP32_LDAP_NO_MEMORY; ret = WLDAP32_LDAP_NO_MEMORY;
TRACE( "(%p, %s, 0x%08lx, %s, %p, 0x%08lx, %p)\n", ld, debugstr_a(base), TRACE( "(%p, %s, 0x%08x, %s, %p, 0x%08x, %p)\n", ld, debugstr_a(base),
scope, debugstr_a(filter), attrs, attrsonly, res ); scope, debugstr_a(filter), attrs, attrsonly, res );
if (!ld || !res) return WLDAP32_LDAP_PARAM_ERROR; if (!ld || !res) return WLDAP32_LDAP_PARAM_ERROR;
...@@ -503,7 +503,7 @@ ULONG CDECL ldap_search_sW( WLDAP32_LDAP *ld, PWCHAR base, ULONG scope, PWCHAR f ...@@ -503,7 +503,7 @@ ULONG CDECL ldap_search_sW( WLDAP32_LDAP *ld, PWCHAR base, ULONG scope, PWCHAR f
ret = WLDAP32_LDAP_NO_MEMORY; ret = WLDAP32_LDAP_NO_MEMORY;
TRACE( "(%p, %s, 0x%08lx, %s, %p, 0x%08lx, %p)\n", ld, debugstr_w(base), TRACE( "(%p, %s, 0x%08x, %s, %p, 0x%08x, %p)\n", ld, debugstr_w(base),
scope, debugstr_w(filter), attrs, attrsonly, res ); scope, debugstr_w(filter), attrs, attrsonly, res );
if (!ld || !res) return WLDAP32_LDAP_PARAM_ERROR; if (!ld || !res) return WLDAP32_LDAP_PARAM_ERROR;
...@@ -548,7 +548,7 @@ ULONG CDECL ldap_search_stA( WLDAP32_LDAP *ld, const PCHAR base, ULONG scope, ...@@ -548,7 +548,7 @@ ULONG CDECL ldap_search_stA( WLDAP32_LDAP *ld, const PCHAR base, ULONG scope,
ret = WLDAP32_LDAP_NO_MEMORY; ret = WLDAP32_LDAP_NO_MEMORY;
TRACE( "(%p, %s, 0x%08lx, %s, %p, 0x%08lx, %p, %p)\n", ld, TRACE( "(%p, %s, 0x%08x, %s, %p, 0x%08x, %p, %p)\n", ld,
debugstr_a(base), scope, debugstr_a(filter), attrs, debugstr_a(base), scope, debugstr_a(filter), attrs,
attrsonly, timeout, res ); attrsonly, timeout, res );
...@@ -612,7 +612,7 @@ ULONG CDECL ldap_search_stW( WLDAP32_LDAP *ld, const PWCHAR base, ULONG scope, ...@@ -612,7 +612,7 @@ ULONG CDECL ldap_search_stW( WLDAP32_LDAP *ld, const PWCHAR base, ULONG scope,
ret = WLDAP32_LDAP_NO_MEMORY; ret = WLDAP32_LDAP_NO_MEMORY;
TRACE( "(%p, %s, 0x%08lx, %s, %p, 0x%08lx, %p, %p)\n", ld, TRACE( "(%p, %s, 0x%08x, %s, %p, 0x%08x, %p, %p)\n", ld,
debugstr_w(base), scope, debugstr_w(filter), attrs, debugstr_w(base), scope, debugstr_w(filter), attrs,
attrsonly, timeout, res ); attrsonly, timeout, res );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment