diff --git a/dlls/dnsapi/Makefile.in b/dlls/dnsapi/Makefile.in
index d8d2915749..51c254a7d9 100644
--- a/dlls/dnsapi/Makefile.in
+++ b/dlls/dnsapi/Makefile.in
@@ -6,7 +6,6 @@ MODULE    = dnsapi.dll
 IMPORTLIB = libdnsapi.$(IMPLIBEXT)
 IMPORTS   = netapi32 kernel32
 EXTRALIBS = @RESOLVLIBS@
-EXTRADEFS = -DWINE_NO_LONG_AS_INT
 
 C_SRCS = \
 	main.c \
diff --git a/dlls/dnsapi/main.c b/dlls/dnsapi/main.c
index faa9cc0914..778f7a9fb6 100644
--- a/dlls/dnsapi/main.c
+++ b/dlls/dnsapi/main.c
@@ -34,7 +34,7 @@ HINSTANCE hdnsapi;
 
 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)
     {
@@ -57,7 +57,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
 DNS_STATUS WINAPI DnsAcquireContextHandle_A( DWORD flags, PVOID cred,
                                              HANDLE *context )
 {
-    FIXME( "(0x%08lx,%p,%p) stub\n", flags, cred, context );
+    FIXME( "(0x%08x,%p,%p) stub\n", flags, cred, context );
 
     *context = (HANDLE)0xdeadbeef;
     return ERROR_SUCCESS;
@@ -70,7 +70,7 @@ DNS_STATUS WINAPI DnsAcquireContextHandle_A( DWORD flags, PVOID cred,
 DNS_STATUS WINAPI DnsAcquireContextHandle_UTF8( DWORD flags, PVOID cred,
                                                 HANDLE *context )
 {
-    FIXME( "(0x%08lx,%p,%p) stub\n", flags, cred, context );
+    FIXME( "(0x%08x,%p,%p) stub\n", flags, cred, context );
 
     *context = (HANDLE)0xdeadbeef;
     return ERROR_SUCCESS;
@@ -83,7 +83,7 @@ DNS_STATUS WINAPI DnsAcquireContextHandle_UTF8( DWORD flags, PVOID cred,
 DNS_STATUS WINAPI DnsAcquireContextHandle_W( DWORD flags, PVOID cred,
                                              HANDLE *context )
 {
-    FIXME( "(0x%08lx,%p,%p) stub\n", flags, cred, context );
+    FIXME( "(0x%08x,%p,%p) stub\n", flags, cred, context );
 
     *context = (HANDLE)0xdeadbeef;
     return ERROR_SUCCESS;
@@ -132,7 +132,7 @@ DNS_STATUS WINAPI DnsModifyRecordsInSet_A( PDNS_RECORDA add, PDNS_RECORDA delete
                                            DWORD options, HANDLE context,
                                            PIP4_ARRAY servers, PVOID reserved )
 {
-    FIXME( "(%p,%p,0x%08lx,%p,%p,%p) stub\n", add, delete, options,
+    FIXME( "(%p,%p,0x%08x,%p,%p,%p) stub\n", add, delete, options,
            context, servers, reserved );
     return ERROR_SUCCESS;
 }
@@ -145,7 +145,7 @@ DNS_STATUS WINAPI DnsModifyRecordsInSet_UTF8( PDNS_RECORDA add, PDNS_RECORDA del
                                               DWORD options, HANDLE context,
                                               PIP4_ARRAY servers, PVOID reserved )
 {
-    FIXME( "(%p,%p,0x%08lx,%p,%p,%p) stub\n", add, delete, options,
+    FIXME( "(%p,%p,0x%08x,%p,%p,%p) stub\n", add, delete, options,
            context, servers, reserved );
     return ERROR_SUCCESS;
 }
@@ -158,7 +158,7 @@ DNS_STATUS WINAPI DnsModifyRecordsInSet_W( PDNS_RECORDW add, PDNS_RECORDW delete
                                            DWORD options, HANDLE context,
                                            PIP4_ARRAY servers, PVOID reserved )
 {
-    FIXME( "(%p,%p,0x%08lx,%p,%p,%p) stub\n", add, delete, options,
+    FIXME( "(%p,%p,0x%08x,%p,%p,%p) stub\n", add, delete, options,
            context, servers, reserved );
     return ERROR_SUCCESS;
 }
@@ -184,7 +184,7 @@ DNS_STATUS WINAPI DnsReplaceRecordSetA( PDNS_RECORDA set, DWORD options,
                                         HANDLE context, PIP4_ARRAY servers,
                                         PVOID reserved )
 {
-    FIXME( "(%p,0x%08lx,%p,%p,%p) stub\n", set, options, context,
+    FIXME( "(%p,0x%08x,%p,%p,%p) stub\n", set, options, context,
            servers, reserved );
     return ERROR_SUCCESS;
 }
@@ -197,7 +197,7 @@ DNS_STATUS WINAPI DnsReplaceRecordSetUTF8( PDNS_RECORDA set, DWORD options,
                                            HANDLE context, PIP4_ARRAY servers,
                                            PVOID reserved )
 {
-    FIXME( "(%p,0x%08lx,%p,%p,%p) stub\n", set, options, context,
+    FIXME( "(%p,0x%08x,%p,%p,%p) stub\n", set, options, context,
            servers, reserved );
     return ERROR_SUCCESS;
 }
@@ -210,7 +210,7 @@ DNS_STATUS WINAPI DnsReplaceRecordSetW( PDNS_RECORDW set, DWORD options,
                                         HANDLE context, PIP4_ARRAY servers,
                                         PVOID reserved )
 {
-    FIXME( "(%p,0x%08lx,%p,%p,%p) stub\n", set, options, context,
+    FIXME( "(%p,0x%08x,%p,%p,%p) stub\n", set, options, context,
            servers, reserved );
     return ERROR_SUCCESS;
 }
diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c
index 836255c9ab..509e2813c7 100644
--- a/dlls/dnsapi/query.c
+++ b/dlls/dnsapi/query.c
@@ -554,7 +554,7 @@ static DNS_STATUS dns_set_serverlist( PIP4_ARRAY addrs )
 
     if (addrs->AddrCount > MAXNS) 
     {
-        WARN( "too many servers: %ld only using the first: %d\n",
+        WARN( "too many servers: %d only using the first: %d\n",
               addrs->AddrCount, MAXNS );
         _res.nscount = MAXNS;
     }
@@ -656,7 +656,7 @@ DNS_STATUS WINAPI DnsQuery_A( PCSTR name, WORD type, DWORD options, PIP4_ARRAY s
     DNS_RECORDW *resultW;
     DNS_STATUS status;
 
-    TRACE( "(%s,%s,0x%08lx,%p,%p,%p)\n", debugstr_a(name), dns_type_to_str( type ),
+    TRACE( "(%s,%s,0x%08x,%p,%p,%p)\n", debugstr_a(name), dns_type_to_str( type ),
            options, servers, result, reserved );
 
     if (!name || !result)
@@ -690,7 +690,7 @@ DNS_STATUS WINAPI DnsQuery_UTF8( PCSTR name, WORD type, DWORD options, PIP4_ARRA
     DNS_STATUS ret = DNS_ERROR_RCODE_NOT_IMPLEMENTED;
 #ifdef HAVE_RESOLV
 
-    TRACE( "(%s,%s,0x%08lx,%p,%p,%p)\n", debugstr_a(name), dns_type_to_str( type ),
+    TRACE( "(%s,%s,0x%08x,%p,%p,%p)\n", debugstr_a(name), dns_type_to_str( type ),
            options, servers, result, reserved );
 
     if (!name || !result)
@@ -733,7 +733,7 @@ DNS_STATUS WINAPI DnsQuery_W( PCWSTR name, WORD type, DWORD options, PIP4_ARRAY
     DNS_RECORDA *resultA;
     DNS_STATUS status;
 
-    TRACE( "(%s,%s,0x%08lx,%p,%p,%p)\n", debugstr_w(name), dns_type_to_str( type ),
+    TRACE( "(%s,%s,0x%08x,%p,%p,%p)\n", debugstr_w(name), dns_type_to_str( type ),
            options, servers, result, reserved );
 
     if (!name || !result)
@@ -804,7 +804,7 @@ DNS_STATUS WINAPI DnsQueryConfig( DNS_CONFIG_TYPE config, DWORD flag, PWSTR adap
 {
     DNS_STATUS ret = ERROR_INVALID_PARAMETER;
 
-    TRACE( "(%d,0x%08lx,%s,%p,%p,%p)\n", config, flag, debugstr_w(adapter),
+    TRACE( "(%d,0x%08x,%s,%p,%p,%p)\n", config, flag, debugstr_w(adapter),
            reserved, buffer, len );
 
     if (!len) return ERROR_INVALID_PARAMETER;