diff --git a/dlls/wldap32/Makefile.in b/dlls/wldap32/Makefile.in
index 3b1f71c0dda..562b1b1601a 100644
--- a/dlls/wldap32/Makefile.in
+++ b/dlls/wldap32/Makefile.in
@@ -6,7 +6,6 @@ MODULE    = wldap32.dll
 IMPORTLIB = libwldap32.$(IMPLIBEXT)
 IMPORTS   = user32 kernel32
 EXTRALIBS = @LDAPLIBS@
-EXTRADEFS = -DWINE_NO_LONG_AS_INT
 
 C_SRCS = \
 	add.c \
diff --git a/dlls/wldap32/bind.c b/dlls/wldap32/bind.c
index db38c768828..39bd2211669 100644
--- a/dlls/wldap32/bind.c
+++ b/dlls/wldap32/bind.c
@@ -54,7 +54,7 @@ ULONG CDECL ldap_bindA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR cred, ULONG method )
 
     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;
 
@@ -105,7 +105,7 @@ ULONG CDECL ldap_bindW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR cred, ULONG method )
 
     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 (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 )
 
     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;
 
@@ -197,7 +197,7 @@ ULONG CDECL ldap_bind_sW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR cred, ULONG method
 
     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 (method != LDAP_AUTH_SIMPLE) return WLDAP32_LDAP_PARAM_ERROR;
diff --git a/dlls/wldap32/dn.c b/dlls/wldap32/dn.c
index 7616ecc129a..0e6610d3fe5 100644
--- a/dlls/wldap32/dn.c
+++ b/dlls/wldap32/dn.c
@@ -113,7 +113,7 @@ PCHAR * CDECL ldap_explode_dnA( PCHAR dn, ULONG notypes )
 #ifdef HAVE_LDAP
     WCHAR *dnW, **retW;
 
-    TRACE( "(%s, 0x%08lx)\n", debugstr_a(dn), notypes );
+    TRACE( "(%s, 0x%08x)\n", debugstr_a(dn), notypes );
 
     dnW = strAtoW( dn );
     if (!dnW) return NULL;
@@ -151,7 +151,7 @@ PWCHAR * CDECL ldap_explode_dnW( PWCHAR dn, ULONG notypes )
 #ifdef HAVE_LDAP
     char *dnU, **retU;
 
-    TRACE( "(%s, 0x%08lx)\n", debugstr_w(dn), notypes );
+    TRACE( "(%s, 0x%08x)\n", debugstr_w(dn), notypes );
 
     dnU = strWtoU( dn );
     if (!dnU) return NULL;
diff --git a/dlls/wldap32/error.c b/dlls/wldap32/error.c
index 2558c9091c8..5f43f8d4c69 100644
--- a/dlls/wldap32/error.c
+++ b/dlls/wldap32/error.c
@@ -53,7 +53,7 @@ PCHAR CDECL ldap_err2stringA( ULONG err )
 {
     static char buf[256] = "";
 
-    TRACE( "(0x%08lx)\n", err );
+    TRACE( "(0x%08x)\n", err );
 
     if (err <= WLDAP32_LDAP_REFERRAL_LIMIT_EXCEEDED)
         LoadStringA( hwldap32, err, buf, 256 );
@@ -83,7 +83,7 @@ PWCHAR CDECL ldap_err2stringW( ULONG err )
 {
     static WCHAR buf[256] = { 0 };
 
-    TRACE( "(0x%08lx)\n", err );
+    TRACE( "(0x%08x)\n", err );
 
     if (err <= WLDAP32_LDAP_REFERRAL_LIMIT_EXCEEDED)
         LoadStringW( hwldap32, err, buf, 256 );
@@ -136,7 +136,7 @@ ULONG CDECL WLDAP32_ldap_result2error( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *re
 #ifdef HAVE_LDAP
     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;
 
@@ -282,7 +282,7 @@ static const ULONG WLDAP32_errormap[] = {
  */
 ULONG CDECL LdapMapErrorToWin32( ULONG err )
 {
-    TRACE( "(0x%08lx)\n", err );
+    TRACE( "(0x%08x)\n", err );
 
     if (err >= sizeof(WLDAP32_errormap)/sizeof(WLDAP32_errormap[0]))
         return ERROR_DS_GENERIC_ERROR;
diff --git a/dlls/wldap32/extended.c b/dlls/wldap32/extended.c
index 365f86b4dfa..a3dbc2e3304 100644
--- a/dlls/wldap32/extended.c
+++ b/dlls/wldap32/extended.c
@@ -60,7 +60,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
  */
 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;
     return LDAP_SUCCESS;
diff --git a/dlls/wldap32/init.c b/dlls/wldap32/init.c
index 920e169b121..71dab849001 100644
--- a/dlls/wldap32/init.c
+++ b/dlls/wldap32/init.c
@@ -136,7 +136,7 @@ static char *join_hostnames( const char *scheme, char **hostnames, ULONG portnum
 {
     char *res, *p, *q, **v;
     unsigned int i = 0, size = 0; 
-    static const char sep[] = " ", fmt[] = ":%ld";
+    static const char sep[] = " ", fmt[] = ":%d";
     char port[7];
 
     sprintf( port, fmt, portnumber ); 
@@ -224,7 +224,7 @@ WLDAP32_LDAP * CDECL cldap_openA( PCHAR hostname, ULONG portnumber )
     WLDAP32_LDAP *ld = NULL;
     WCHAR *hostnameW = NULL;
 
-    TRACE( "(%s, %ld)\n", debugstr_a(hostname), portnumber );
+    TRACE( "(%s, %d)\n", debugstr_a(hostname), portnumber );
 
     if (hostname) {
         hostnameW = strAtoW( hostname );
@@ -268,7 +268,7 @@ WLDAP32_LDAP * CDECL cldap_openW( PWCHAR hostname, ULONG portnumber )
     LDAP *ld = NULL;
     char *hostnameU = NULL, *url = NULL;
 
-    TRACE( "(%s, %ld)\n", debugstr_w(hostname), portnumber );
+    TRACE( "(%s, %d)\n", debugstr_w(hostname), portnumber );
 
     if (hostname) {
         hostnameU = strWtoU( hostname );
@@ -330,7 +330,7 @@ WLDAP32_LDAP *  CDECL ldap_initA( PCHAR hostname, ULONG portnumber )
     WLDAP32_LDAP *ld = NULL;
     WCHAR *hostnameW = NULL;
 
-    TRACE( "(%s, %ld)\n", debugstr_a(hostname), portnumber );
+    TRACE( "(%s, %d)\n", debugstr_a(hostname), portnumber );
 
     if (hostname) {
         hostnameW = strAtoW( hostname );
@@ -375,7 +375,7 @@ WLDAP32_LDAP * CDECL ldap_initW( PWCHAR hostname, ULONG portnumber )
     LDAP *ld = NULL;
     char *hostnameU = NULL, *url = NULL;
 
-    TRACE( "(%s, %ld)\n", debugstr_w(hostname), portnumber );
+    TRACE( "(%s, %d)\n", debugstr_w(hostname), portnumber );
 
     if (hostname) {
         hostnameU = strWtoU( hostname );
@@ -411,7 +411,7 @@ WLDAP32_LDAP * CDECL ldap_openA( PCHAR hostname, ULONG portnumber )
     WLDAP32_LDAP *ld = NULL;
     WCHAR *hostnameW = NULL;
 
-    TRACE( "(%s, %ld)\n", debugstr_a(hostname), portnumber );
+    TRACE( "(%s, %d)\n", debugstr_a(hostname), portnumber );
 
     if (hostname) {
         hostnameW = strAtoW( hostname );
@@ -455,7 +455,7 @@ WLDAP32_LDAP * CDECL ldap_openW( PWCHAR hostname, ULONG portnumber )
     LDAP *ld = NULL;
     char *hostnameU = NULL, *url = NULL;
 
-    TRACE( "(%s, %ld)\n", debugstr_w(hostname), portnumber );
+    TRACE( "(%s, %d)\n", debugstr_w(hostname), portnumber );
 
     if (hostname) {
         hostnameU = strWtoU( hostname );
@@ -491,7 +491,7 @@ WLDAP32_LDAP * CDECL ldap_sslinitA( PCHAR hostname, ULONG portnumber, int secure
     WLDAP32_LDAP *ld;
     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) {
         hostnameW = strAtoW( hostname );
@@ -536,7 +536,7 @@ WLDAP32_LDAP * CDECL ldap_sslinitW( PWCHAR hostname, ULONG portnumber, int secur
     WLDAP32_LDAP *ld = 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) {
         hostnameU = strWtoU( hostname );
diff --git a/dlls/wldap32/main.c b/dlls/wldap32/main.c
index 049826555dd..a00dee3bd70 100644
--- a/dlls/wldap32/main.c
+++ b/dlls/wldap32/main.c
@@ -32,7 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
 
 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)
     {
diff --git a/dlls/wldap32/misc.c b/dlls/wldap32/misc.c
index 04df65901f1..9007fafef42 100644
--- a/dlls/wldap32/misc.c
+++ b/dlls/wldap32/misc.c
@@ -60,7 +60,7 @@ ULONG CDECL WLDAP32_ldap_abandon( WLDAP32_LDAP *ld, ULONG msgid )
     ULONG ret = LDAP_NOT_SUPPORTED;
 #ifdef HAVE_LDAP
 
-    TRACE( "(%p, 0x%08lx)\n", ld, msgid );
+    TRACE( "(%p, 0x%08x)\n", ld, msgid );
 
     if (!ld) return ~0UL;
     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
 {
     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 );
     if (!dst) return len;
@@ -281,7 +281,7 @@ ULONG CDECL ldap_escape_filter_elementW( PCHAR src, ULONG srclen, PWCHAR dst, UL
 {
     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 );
     if (!dst) return len;
@@ -611,7 +611,7 @@ ULONG CDECL WLDAP32_ldap_result( WLDAP32_LDAP *ld, ULONG msgid, ULONG all,
     ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
 #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;
     ret = ldap_result( ld, msgid, all, (struct timeval *)timeout, res );
diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c
index 556758598db..cfea875cd71 100644
--- a/dlls/wldap32/page.c
+++ b/dlls/wldap32/page.c
@@ -57,7 +57,7 @@ ULONG CDECL ldap_create_page_controlA( WLDAP32_LDAP *ld, ULONG pagesize,
 #ifdef HAVE_LDAP
     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 );
 
     if (!ld || !control || pagesize > LDAP_MAXINT)
@@ -152,7 +152,7 @@ ULONG CDECL ldap_create_page_controlW( WLDAP32_LDAP *ld, ULONG pagesize,
     ULONG ret = LDAP_NOT_SUPPORTED;
 #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 );
 
     if (!ld || !control || pagesize > LDAP_MAXINT)
@@ -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 *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;
     return LDAP_NOT_SUPPORTED;
@@ -177,7 +177,7 @@ ULONG CDECL ldap_get_next_page_s( WLDAP32_LDAP *ld, PLDAPSearch search,
     struct l_timeval *timeout, ULONG pagesize, ULONG *count,
     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 );
 
     if (!ld) return ~0UL;
@@ -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,
     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 );
     return NULL;
 }
@@ -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,
     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 );
     return NULL;
 }
diff --git a/dlls/wldap32/parse.c b/dlls/wldap32/parse.c
index c8742a0e46b..e47adf2e849 100644
--- a/dlls/wldap32/parse.c
+++ b/dlls/wldap32/parse.c
@@ -325,6 +325,7 @@ ULONG CDECL ldap_parse_sort_controlW( WLDAP32_LDAP *ld, PLDAPControlW *control,
 #ifdef HAVE_LDAP
     char *attrU = NULL;
     LDAPControl **controlU = NULL;
+    unsigned long res;
 
     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,
         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 );
     controlarrayfreeU( controlU );
 
@@ -403,6 +405,7 @@ INT CDECL ldap_parse_vlv_controlW( WLDAP32_LDAP *ld, PLDAPControlW *control,
     int ret = LDAP_NOT_SUPPORTED;
 #ifdef HAVE_LDAP
     LDAPControl **controlU = NULL;
+    unsigned long pos, count;
 
     TRACE( "(%p, %p, %p, %p, %p, %p)\n", ld, control, targetpos,
            listcount, context, errcode );
@@ -414,9 +417,11 @@ INT CDECL ldap_parse_vlv_controlW( WLDAP32_LDAP *ld, PLDAPControlW *control,
         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 );
 
+    *targetpos = pos;
+    *listcount = count;
     controlarrayfreeU( controlU );
 
 #endif
diff --git a/dlls/wldap32/search.c b/dlls/wldap32/search.c
index 030482fb87c..59899b89743 100644
--- a/dlls/wldap32/search.c
+++ b/dlls/wldap32/search.c
@@ -55,7 +55,7 @@ ULONG CDECL ldap_searchA( WLDAP32_LDAP *ld, PCHAR base, ULONG scope, PCHAR filte
 
     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 );
 
     if (!ld) return ~0UL;
@@ -117,7 +117,7 @@ ULONG CDECL ldap_searchW( WLDAP32_LDAP *ld, PWCHAR base, ULONG scope, PWCHAR fil
 
     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 );
 
     if (!ld) return ~0UL;
@@ -168,7 +168,7 @@ ULONG CDECL ldap_search_extA( WLDAP32_LDAP *ld, PCHAR base, ULONG scope,
 
     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,
            serverctrls, clientctrls, timelimit, sizelimit, message );
 
@@ -250,7 +250,7 @@ ULONG CDECL ldap_search_extW( WLDAP32_LDAP *ld, PWCHAR base, ULONG scope,
 
     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,
            serverctrls, clientctrls, timelimit, sizelimit, message );
 
@@ -310,7 +310,7 @@ ULONG CDECL ldap_search_ext_sA( WLDAP32_LDAP *ld, PCHAR base, ULONG scope,
 
     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,
            serverctrls, clientctrls, timeout, sizelimit, res );
 
@@ -388,7 +388,7 @@ ULONG CDECL ldap_search_ext_sW( WLDAP32_LDAP *ld, PWCHAR base, ULONG scope,
 
     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,
            serverctrls, clientctrls, timeout, sizelimit, res );
 
@@ -443,7 +443,7 @@ ULONG CDECL ldap_search_sA( WLDAP32_LDAP *ld, PCHAR base, ULONG scope, PCHAR fil
 
     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 );
 
     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
 
     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 );
 
     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,
 
     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,
            attrsonly, timeout, res );
 
@@ -612,7 +612,7 @@ ULONG CDECL ldap_search_stW( WLDAP32_LDAP *ld, const PWCHAR base, ULONG scope,
 
     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,
            attrsonly, timeout, res );