diff --git a/dlls/msado15/Makefile.in b/dlls/msado15/Makefile.in
index b95e974e8d1..9c1fba502c5 100644
--- a/dlls/msado15/Makefile.in
+++ b/dlls/msado15/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = msado15.dll
 IMPORTS   = oleaut32 ole32
 
diff --git a/dlls/msado15/command.c b/dlls/msado15/command.c
index 63ec9b23a01..b796dd0a8a4 100644
--- a/dlls/msado15/command.c
+++ b/dlls/msado15/command.c
@@ -100,7 +100,7 @@ static HRESULT WINAPI command_GetTypeInfoCount( _Command *iface, UINT *count )
 static HRESULT WINAPI command_GetTypeInfo( _Command *iface, UINT index, LCID lcid, ITypeInfo **info )
 {
     struct command *command = impl_from_Command( iface );
-    TRACE( "%p, %u, %u, %p\n", command, index, lcid, info );
+    TRACE( "%p, %u, %lu, %p\n", command, index, lcid, info );
     return get_typeinfo(Command_tid, info);
 }
 
@@ -111,7 +111,7 @@ static HRESULT WINAPI command_GetIDsOfNames( _Command *iface, REFIID riid, LPOLE
     HRESULT hr;
     ITypeInfo *typeinfo;
 
-    TRACE( "%p, %s, %p, %u, %u, %p\n", command, debugstr_guid(riid), names, count, lcid, dispid );
+    TRACE( "%p, %s, %p, %u, %lu, %p\n", command, debugstr_guid(riid), names, count, lcid, dispid );
 
     hr = get_typeinfo(Command_tid, &typeinfo);
     if(SUCCEEDED(hr))
@@ -130,7 +130,7 @@ static HRESULT WINAPI command_Invoke( _Command *iface, DISPID member, REFIID rii
     HRESULT hr;
     ITypeInfo *typeinfo;
 
-    TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", command, member, debugstr_guid(riid), lcid, flags, params,
+    TRACE( "%p, %ld, %s, %ld, %d, %p, %p, %p, %p\n", command, member, debugstr_guid(riid), lcid, flags, params,
            result, excep_info, arg_err );
 
     hr = get_typeinfo(Command_tid, &typeinfo);
@@ -210,7 +210,7 @@ static HRESULT WINAPI command_get_CommandTimeout( _Command *iface, LONG *timeout
 
 static HRESULT WINAPI command_put_CommandTimeout( _Command *iface, LONG timeout )
 {
-    FIXME( "%p, %d\n", iface, timeout );
+    FIXME( "%p, %ld\n", iface, timeout );
     return E_NOTIMPL;
 }
 
@@ -229,7 +229,7 @@ static HRESULT WINAPI command_put_Prepared( _Command *iface, VARIANT_BOOL prepar
 static HRESULT WINAPI command_Execute( _Command *iface, VARIANT *affected, VARIANT *parameters,
                                        LONG options, _Recordset **recordset )
 {
-    FIXME( "%p, %p, %p, %d, %p\n", iface, affected, parameters, options, recordset );
+    FIXME( "%p, %p, %p, %ld, %p\n", iface, affected, parameters, options, recordset );
     return E_NOTIMPL;
 }
 
@@ -237,7 +237,7 @@ static HRESULT WINAPI command_CreateParameter( _Command *iface, BSTR name, DataT
                                                ParameterDirectionEnum direction, ADO_LONGPTR size, VARIANT value,
                                                _Parameter **parameter )
 {
-    FIXME( "%p, %s, %d, %d, %ld, %p\n", iface, debugstr_w(name), type, direction, size, parameter );
+    FIXME( "%p, %s, %d, %d, %Id, %p\n", iface, debugstr_w(name), type, direction, size, parameter );
     return E_NOTIMPL;
 }
 
diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c
index 762277843e8..e1fbea187b0 100644
--- a/dlls/msado15/connection.c
+++ b/dlls/msado15/connection.c
@@ -165,7 +165,7 @@ static HRESULT WINAPI connection_GetTypeInfoCount( _Connection *iface, UINT *cou
 static HRESULT WINAPI connection_GetTypeInfo( _Connection *iface, UINT index, LCID lcid, ITypeInfo **info )
 {
     struct connection *connection = impl_from_Connection( iface );
-    TRACE( "%p, %u, %u, %p\n", connection, index, lcid, info );
+    TRACE( "%p, %u, %lu, %p\n", connection, index, lcid, info );
     return get_typeinfo(Connection_tid, info);
 }
 
@@ -176,7 +176,7 @@ static HRESULT WINAPI connection_GetIDsOfNames( _Connection *iface, REFIID riid,
     HRESULT hr;
     ITypeInfo *typeinfo;
 
-    TRACE( "%p, %s, %p, %u, %u, %p\n", connection, debugstr_guid(riid), names, count, lcid, dispid );
+    TRACE( "%p, %s, %p, %u, %lu, %p\n", connection, debugstr_guid(riid), names, count, lcid, dispid );
 
     hr = get_typeinfo(Connection_tid, &typeinfo);
     if(SUCCEEDED(hr))
@@ -195,7 +195,7 @@ static HRESULT WINAPI connection_Invoke( _Connection *iface, DISPID member, REFI
     HRESULT hr;
     ITypeInfo *typeinfo;
 
-    TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", connection, member, debugstr_guid(riid), lcid, flags,
+    TRACE( "%p, %ld, %s, %ld, %d, %p, %p, %p, %p\n", connection, member, debugstr_guid(riid), lcid, flags,
            params, result, excep_info, arg_err );
 
     hr = get_typeinfo(Connection_tid, &typeinfo);
@@ -251,7 +251,7 @@ static HRESULT WINAPI connection_get_CommandTimeout( _Connection *iface, LONG *t
 static HRESULT WINAPI connection_put_CommandTimeout( _Connection *iface, LONG timeout )
 {
     struct connection *connection = impl_from_Connection( iface );
-    TRACE( "%p, %d\n", connection, timeout );
+    TRACE( "%p, %ld\n", connection, timeout );
     connection->timeout = timeout;
     return S_OK;
 }
@@ -264,7 +264,7 @@ static HRESULT WINAPI connection_get_ConnectionTimeout( _Connection *iface, LONG
 
 static HRESULT WINAPI connection_put_ConnectionTimeout( _Connection *iface, LONG timeout )
 {
-    FIXME( "%p, %d\n", iface, timeout );
+    FIXME( "%p, %ld\n", iface, timeout );
     return E_NOTIMPL;
 }
 
@@ -301,7 +301,7 @@ static HRESULT WINAPI connection_Execute( _Connection *iface, BSTR command, VARI
     VARIANT source, active;
     IDispatch *dispatch;
 
-    FIXME( "%p, %s, %p, 0x%08x, %p Semi-stub\n", iface, debugstr_w(command), records_affected, options, record_set );
+    FIXME( "%p, %s, %p, 0x%08lx, %p Semi-stub\n", iface, debugstr_w(command), records_affected, options, record_set );
 
     if (connection->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed );
 
@@ -375,7 +375,7 @@ static HRESULT WINAPI connection_Open( _Connection *iface, BSTR connect_str, BST
     IDBCreateSession *session = NULL;
     HRESULT hr;
 
-    TRACE( "%p, %s, %s, %p, %08x\n", iface, debugstr_w(connect_str), debugstr_w(userid), password, options );
+    TRACE( "%p, %s, %s, %p, %08lx\n", iface, debugstr_w(connect_str), debugstr_w(userid), password, options );
 
     if (connection->state == adStateOpen) return MAKE_ADO_HRESULT( adErrObjectOpen );
     if (!connect_str) return E_FAIL;
@@ -411,7 +411,7 @@ done:
     }
     IDataInitialize_Release( datainit );
 
-    TRACE("ret 0x%08x\n", hr);
+    TRACE("ret 0x%08lx\n", hr);
     return hr;
 }
 
@@ -453,7 +453,7 @@ static HRESULT WINAPI connection_get_Attributes( _Connection *iface, LONG *attr
 
 static HRESULT WINAPI connection_put_Attributes( _Connection *iface, LONG attr )
 {
-    FIXME( "%p, %d\n", iface, attr );
+    FIXME( "%p, %ld\n", iface, attr );
     return E_NOTIMPL;
 }
 
@@ -772,7 +772,7 @@ static HRESULT WINAPI connpoint_Advise( IConnectionPoint *iface, IUnknown *unk_s
 static HRESULT WINAPI connpoint_Unadvise( IConnectionPoint *iface, DWORD cookie )
 {
     struct connection_point *connpoint = impl_from_IConnectionPoint( iface );
-    TRACE( "%p, %u\n", connpoint, cookie );
+    TRACE( "%p, %lu\n", connpoint, cookie );
 
     if (!cookie || cookie > connpoint->sinks_size || !connpoint->sinks || !connpoint->sinks[cookie - 1])
         return E_FAIL;
diff --git a/dlls/msado15/main.c b/dlls/msado15/main.c
index 1b1d4509c1a..edbbaeb9e6e 100644
--- a/dlls/msado15/main.c
+++ b/dlls/msado15/main.c
@@ -161,7 +161,7 @@ static HRESULT load_typelib(void)
 
     hres = LoadRegTypeLib(&LIBID_ADODB, 1, 0, LOCALE_SYSTEM_DEFAULT, &tl);
     if(FAILED(hres)) {
-        ERR("LoadRegTypeLib failed: %08x\n", hres);
+        ERR("LoadRegTypeLib failed: %08lx\n", hres);
         return hres;
     }
 
@@ -182,7 +182,7 @@ HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo)
 
         hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti);
         if(FAILED(hres)) {
-            ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hres);
+            ERR("GetTypeInfoOfGuid(%s) failed: %08lx\n", debugstr_guid(tid_ids[tid]), hres);
             return hres;
         }
 
diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c
index 8d862628774..3bbb4bd3300 100644
--- a/dlls/msado15/recordset.c
+++ b/dlls/msado15/recordset.c
@@ -89,7 +89,7 @@ static ULONG WINAPI field_AddRef( Field *iface )
 {
     struct field *field = impl_from_Field( iface );
     LONG refs = InterlockedIncrement( &field->refs );
-    TRACE( "%p new refcount %d\n", field, refs );
+    TRACE( "%p new refcount %ld\n", field, refs );
     return refs;
 }
 
@@ -97,7 +97,7 @@ static ULONG WINAPI field_Release( Field *iface )
 {
     struct field *field = impl_from_Field( iface );
     LONG refs = InterlockedDecrement( &field->refs );
-    TRACE( "%p new refcount %d\n", field, refs );
+    TRACE( "%p new refcount %ld\n", field, refs );
     if (!refs)
     {
         TRACE( "destroying %p\n", field );
@@ -141,7 +141,7 @@ static HRESULT WINAPI field_GetTypeInfoCount( Field *iface, UINT *count )
 static HRESULT WINAPI field_GetTypeInfo( Field *iface, UINT index, LCID lcid, ITypeInfo **info )
 {
     struct field *field = impl_from_Field( iface );
-    TRACE( "%p, %u, %u, %p\n", field, index, lcid, info );
+    TRACE( "%p, %u, %lu, %p\n", field, index, lcid, info );
     return get_typeinfo(Field_tid, info);
 }
 
@@ -152,7 +152,7 @@ static HRESULT WINAPI field_GetIDsOfNames( Field *iface, REFIID riid, LPOLESTR *
     HRESULT hr;
     ITypeInfo *typeinfo;
 
-    TRACE( "%p, %s, %p, %u, %u, %p\n", field, debugstr_guid(riid), names, count, lcid, dispid );
+    TRACE( "%p, %s, %p, %u, %lu, %p\n", field, debugstr_guid(riid), names, count, lcid, dispid );
 
     hr = get_typeinfo(Field_tid, &typeinfo);
     if(SUCCEEDED(hr))
@@ -171,7 +171,7 @@ static HRESULT WINAPI field_Invoke( Field *iface, DISPID member, REFIID riid, LC
     HRESULT hr;
     ITypeInfo *typeinfo;
 
-    TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", field, member, debugstr_guid(riid), lcid, flags, params,
+    TRACE( "%p, %ld, %s, %ld, %d, %p, %p, %p, %p\n", field, member, debugstr_guid(riid), lcid, flags, params,
            result, excep_info, arg_err );
 
     hr = get_typeinfo(Field_tid, &typeinfo);
@@ -310,7 +310,7 @@ static HRESULT WINAPI field_AppendChunk( Field *iface, VARIANT data )
 
 static HRESULT WINAPI field_GetChunk( Field *iface, LONG length, VARIANT *var )
 {
-    FIXME( "%p, %d, %p\n", iface, length, var );
+    FIXME( "%p, %ld, %p\n", iface, length, var );
     return E_NOTIMPL;
 }
 
@@ -364,7 +364,7 @@ static HRESULT WINAPI field_put_DefinedSize( Field *iface, ADO_LONGPTR size )
 {
     struct field *field = impl_from_Field( iface );
 
-    TRACE( "%p, %ld\n", field, size );
+    TRACE( "%p, %Id\n", field, size );
 
     field->defined_size = size;
     return S_OK;
@@ -374,7 +374,7 @@ static HRESULT WINAPI field_put_Attributes( Field *iface, LONG attrs )
 {
     struct field *field = impl_from_Field( iface );
 
-    TRACE( "%p, %d\n", field, attrs );
+    TRACE( "%p, %ld\n", field, attrs );
 
     field->attrs = attrs;
     return S_OK;
@@ -498,7 +498,7 @@ static HRESULT WINAPI field_props_GetTypeInfoCount(Properties *iface, UINT *coun
 static HRESULT WINAPI field_props_GetTypeInfo(Properties *iface, UINT index, LCID lcid, ITypeInfo **info)
 {
     struct field *field = impl_from_Properties( iface );
-    TRACE( "%p, %u, %u, %p\n", field, index, lcid, info );
+    TRACE( "%p, %u, %lu, %p\n", field, index, lcid, info );
     return get_typeinfo(Properties_tid, info);
 }
 
@@ -509,7 +509,7 @@ static HRESULT WINAPI field_props_GetIDsOfNames(Properties *iface, REFIID riid,
     HRESULT hr;
     ITypeInfo *typeinfo;
 
-    TRACE( "%p, %s, %p, %u, %u, %p\n", field, debugstr_guid(riid), names, count, lcid, dispid );
+    TRACE( "%p, %s, %p, %u, %lu, %p\n", field, debugstr_guid(riid), names, count, lcid, dispid );
 
     hr = get_typeinfo(Properties_tid, &typeinfo);
     if(SUCCEEDED(hr))
@@ -528,7 +528,7 @@ static HRESULT WINAPI field_props_Invoke(Properties *iface, DISPID member, REFII
     HRESULT hr;
     ITypeInfo *typeinfo;
 
-    TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", field, member, debugstr_guid(riid), lcid, flags, params,
+    TRACE( "%p, %ld, %s, %ld, %d, %p, %p, %p, %p\n", field, member, debugstr_guid(riid), lcid, flags, params,
            result, excep_info, arg_err );
 
     hr = get_typeinfo(Properties_tid, &typeinfo);
@@ -617,7 +617,7 @@ static ULONG WINAPI fields_AddRef( Fields *iface )
 {
     struct fields *fields = impl_from_Fields( iface );
     LONG refs = InterlockedIncrement( &fields->refs );
-    TRACE( "%p new refcount %d\n", fields, refs );
+    TRACE( "%p new refcount %ld\n", fields, refs );
     return refs;
 }
 
@@ -625,7 +625,7 @@ static ULONG WINAPI fields_Release( Fields *iface )
 {
     struct fields *fields = impl_from_Fields( iface );
     LONG refs = InterlockedDecrement( &fields->refs );
-    TRACE( "%p new refcount %d\n", fields, refs );
+    TRACE( "%p new refcount %ld\n", fields, refs );
     if (!refs)
     {
         if (fields->recordset) _Recordset_Release( &fields->recordset->Recordset_iface );
@@ -670,7 +670,7 @@ static HRESULT WINAPI fields_GetTypeInfoCount( Fields *iface, UINT *count )
 static HRESULT WINAPI fields_GetTypeInfo( Fields *iface, UINT index, LCID lcid, ITypeInfo **info )
 {
     struct fields *fields = impl_from_Fields( iface );
-    TRACE( "%p, %u, %u, %p\n", fields, index, lcid, info );
+    TRACE( "%p, %u, %lu, %p\n", fields, index, lcid, info );
     return get_typeinfo(Fields_tid, info);
 }
 
@@ -681,7 +681,7 @@ static HRESULT WINAPI fields_GetIDsOfNames( Fields *iface, REFIID riid, LPOLESTR
     HRESULT hr;
     ITypeInfo *typeinfo;
 
-    TRACE( "%p, %s, %p, %u, %u, %p\n", fields, debugstr_guid(riid), names, count, lcid, dispid );
+    TRACE( "%p, %s, %p, %u, %lu, %p\n", fields, debugstr_guid(riid), names, count, lcid, dispid );
 
     hr = get_typeinfo(Fields_tid, &typeinfo);
     if(SUCCEEDED(hr))
@@ -700,7 +700,7 @@ static HRESULT WINAPI fields_Invoke( Fields *iface, DISPID member, REFIID riid,
     HRESULT hr;
     ITypeInfo *typeinfo;
 
-    TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", fields, member, debugstr_guid(riid), lcid, flags, params,
+    TRACE( "%p, %ld, %s, %ld, %d, %p, %p, %p, %p\n", fields, member, debugstr_guid(riid), lcid, flags, params,
            result, excep_info, arg_err );
 
     hr = get_typeinfo(Fields_tid, &typeinfo);
@@ -833,7 +833,7 @@ static HRESULT WINAPI fields__Append( Fields *iface, BSTR name, DataTypeEnum typ
 {
     struct fields *fields = impl_from_Fields( iface );
 
-    TRACE( "%p, %s, %u, %ld, %d\n", fields, debugstr_w(name), type, size, attr );
+    TRACE( "%p, %s, %u, %Id, %d\n", fields, debugstr_w(name), type, size, attr );
 
     return append_field( fields, name, type, size, attr, NULL );
 }
@@ -849,7 +849,7 @@ static HRESULT WINAPI fields_Append( Fields *iface, BSTR name, DataTypeEnum type
 {
     struct fields *fields = impl_from_Fields( iface );
 
-    TRACE( "%p, %s, %u, %ld, %d, %s\n", fields, debugstr_w(name), type, size, attr, debugstr_variant(&value) );
+    TRACE( "%p, %s, %u, %Id, %d, %s\n", fields, debugstr_w(name), type, size, attr, debugstr_variant(&value) );
 
     return append_field( fields, name, type, size, attr, &value );
 }
@@ -949,8 +949,8 @@ static void map_rowset_fields(struct recordset *recordset, struct fields *fields
     {
         for (i=0; i < columns; i++)
         {
-            TRACE("Adding Column %lu, pwszName: %s, pTypeInfo %p, iOrdinal %lu, dwFlags 0x%08x, "
-                  "ulColumnSize %lu, wType %d, bPrecision %d, bScale %d\n",
+            TRACE("Adding Column %Iu, pwszName: %s, pTypeInfo %p, iOrdinal %Iu, dwFlags 0x%08lx, "
+                  "ulColumnSize %Iu, wType %d, bPrecision %d, bScale %d\n",
                   i, debugstr_w(colinfo[i].pwszName), colinfo[i].pTypeInfo, colinfo[i].iOrdinal,
                   colinfo[i].dwFlags, colinfo[i].ulColumnSize, colinfo[i].wType,
                   colinfo[i].bPrecision, colinfo[i].bScale);
@@ -959,7 +959,7 @@ static void map_rowset_fields(struct recordset *recordset, struct fields *fields
                      colinfo[i].dwFlags, NULL);
             if (FAILED(hr))
             {
-                ERR("Failed to add Field name - 0x%08x\n", hr);
+                ERR("Failed to add Field name - 0x%08lx\n", hr);
                 return;
             }
         }
@@ -1004,7 +1004,7 @@ static ULONG WINAPI recordset_AddRef( _Recordset *iface )
 {
     struct recordset *recordset = impl_from_Recordset( iface );
     LONG refs = InterlockedIncrement( &recordset->refs );
-    TRACE( "%p new refcount %d\n", recordset, refs );
+    TRACE( "%p new refcount %ld\n", recordset, refs );
     return refs;
 }
 
@@ -1041,7 +1041,7 @@ static ULONG WINAPI recordset_Release( _Recordset *iface )
 {
     struct recordset *recordset = impl_from_Recordset( iface );
     LONG refs = InterlockedDecrement( &recordset->refs );
-    TRACE( "%p new refcount %d\n", recordset, refs );
+    TRACE( "%p new refcount %ld\n", recordset, refs );
     if (!refs)
     {
         TRACE( "destroying %p\n", recordset );
@@ -1098,7 +1098,7 @@ static HRESULT WINAPI recordset_GetTypeInfoCount( _Recordset *iface, UINT *count
 static HRESULT WINAPI recordset_GetTypeInfo( _Recordset *iface, UINT index, LCID lcid, ITypeInfo **info )
 {
     struct recordset *recordset = impl_from_Recordset( iface );
-    TRACE( "%p, %u, %u, %p\n", recordset, index, lcid, info );
+    TRACE( "%p, %u, %lu, %p\n", recordset, index, lcid, info );
     return get_typeinfo(Recordset_tid, info);
 }
 
@@ -1109,7 +1109,7 @@ static HRESULT WINAPI recordset_GetIDsOfNames( _Recordset *iface, REFIID riid, L
     HRESULT hr;
     ITypeInfo *typeinfo;
 
-    TRACE( "%p, %s, %p, %u, %u, %p\n", recordset, debugstr_guid(riid), names, count, lcid, dispid );
+    TRACE( "%p, %s, %p, %u, %lu, %p\n", recordset, debugstr_guid(riid), names, count, lcid, dispid );
 
     hr = get_typeinfo(Recordset_tid, &typeinfo);
     if(SUCCEEDED(hr))
@@ -1128,7 +1128,7 @@ static HRESULT WINAPI recordset_Invoke( _Recordset *iface, DISPID member, REFIID
     HRESULT hr;
     ITypeInfo *typeinfo;
 
-    TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", recordset, member, debugstr_guid(riid), lcid, flags, params,
+    TRACE( "%p, %ld, %s, %ld, %d, %p, %p, %p, %p\n", recordset, member, debugstr_guid(riid), lcid, flags, params,
            result, excep_info, arg_err );
 
     hr = get_typeinfo(Recordset_tid, &typeinfo);
@@ -1156,7 +1156,7 @@ static HRESULT WINAPI recordset_get_AbsolutePosition( _Recordset *iface, Positio
 
 static HRESULT WINAPI recordset_put_AbsolutePosition( _Recordset *iface, PositionEnum_Param pos )
 {
-    FIXME( "%p, %ld\n", iface, pos );
+    FIXME( "%p, %Id\n", iface, pos );
     return E_NOTIMPL;
 }
 
@@ -1222,7 +1222,7 @@ static HRESULT WINAPI recordset_get_CacheSize( _Recordset *iface, LONG *size )
 
 static HRESULT WINAPI recordset_put_CacheSize( _Recordset *iface, LONG size )
 {
-    FIXME( "%p, %d\n", iface, size );
+    FIXME( "%p, %ld\n", iface, size );
     return E_NOTIMPL;
 }
 
@@ -1298,7 +1298,7 @@ static HRESULT WINAPI recordset_get_MaxRecords( _Recordset *iface, ADO_LONGPTR *
 
 static HRESULT WINAPI recordset_put_MaxRecords( _Recordset *iface, ADO_LONGPTR max_records )
 {
-    FIXME( "%p, %ld\n", iface, max_records );
+    FIXME( "%p, %Id\n", iface, max_records );
     return E_NOTIMPL;
 }
 
@@ -1388,13 +1388,13 @@ static HRESULT WINAPI recordset_Delete( _Recordset *iface, AffectEnum affect_rec
 
 static HRESULT WINAPI recordset_GetRows( _Recordset *iface, LONG rows, VARIANT start, VARIANT fields, VARIANT *var )
 {
-    FIXME( "%p, %d, %s, %s, %p\n", iface, rows, debugstr_variant(&start), debugstr_variant(&fields), var );
+    FIXME( "%p, %ld, %s, %s, %p\n", iface, rows, debugstr_variant(&start), debugstr_variant(&fields), var );
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI recordset_Move( _Recordset *iface, ADO_LONGPTR num_records, VARIANT start )
 {
-    FIXME( "%p, %ld, %s\n", iface, num_records, debugstr_variant(&start) );
+    FIXME( "%p, %Id, %s\n", iface, num_records, debugstr_variant(&start) );
     return E_NOTIMPL;
 }
 
@@ -1491,7 +1491,7 @@ static HRESULT WINAPI recordset_Open( _Recordset *iface, VARIANT source, VARIANT
     IUnknown *rowset;
     HRESULT hr;
 
-    FIXME( "%p, %s, %s, %d, %d, %d Semi-stub\n", recordset, debugstr_variant(&source), debugstr_variant(&active_connection),
+    FIXME( "%p, %s, %s, %d, %d, %ld Semi-stub\n", recordset, debugstr_variant(&source), debugstr_variant(&active_connection),
            cursor_type, lock_type, options );
 
     if (recordset->state == adStateOpen) return MAKE_ADO_HRESULT( adErrObjectOpen );
@@ -1545,7 +1545,7 @@ static HRESULT WINAPI recordset_Open( _Recordset *iface, VARIANT source, VARIANT
 
 static HRESULT WINAPI recordset_Requery( _Recordset *iface, LONG options )
 {
-    FIXME( "%p, %d\n", iface, options );
+    FIXME( "%p, %ld\n", iface, options );
     return E_NOTIMPL;
 }
 
@@ -1569,7 +1569,7 @@ static HRESULT WINAPI recordset_get_AbsolutePage( _Recordset *iface, PositionEnu
 
 static HRESULT WINAPI recordset_put_AbsolutePage( _Recordset *iface, PositionEnum_Param pos )
 {
-    FIXME( "%p, %ld\n", iface, pos );
+    FIXME( "%p, %Id\n", iface, pos );
     return E_NOTIMPL;
 }
 
@@ -1605,7 +1605,7 @@ static HRESULT WINAPI recordset_get_PageSize( _Recordset *iface, LONG *size )
 
 static HRESULT WINAPI recordset_put_PageSize( _Recordset *iface, LONG size )
 {
-    FIXME( "%p, %d\n", iface, size );
+    FIXME( "%p, %ld\n", iface, size );
     return E_NOTIMPL;
 }
 
@@ -1718,7 +1718,7 @@ static HRESULT WINAPI recordset_put_MarshalOptions( _Recordset *iface, MarshalOp
 static HRESULT WINAPI recordset_Find( _Recordset *iface, BSTR criteria, LONG skip_records,
                                       SearchDirectionEnum search_direction, VARIANT start )
 {
-    FIXME( "%p, %s, %d, %d, %s\n", iface, debugstr_w(criteria), skip_records, search_direction,
+    FIXME( "%p, %s, %ld, %d, %s\n", iface, debugstr_w(criteria), skip_records, search_direction,
            debugstr_variant(&start) );
     return E_NOTIMPL;
 }
@@ -1769,7 +1769,7 @@ static HRESULT WINAPI recordset_GetString( _Recordset *iface, StringFormatEnum s
                                            BSTR column_delimiter, BSTR row_delimiter, BSTR null_expr,
                                            BSTR *ret_string )
 {
-    FIXME( "%p, %u, %d, %s, %s, %s, %p\n", iface, string_format, num_rows, debugstr_w(column_delimiter),
+    FIXME( "%p, %u, %ld, %s, %s, %s, %p\n", iface, string_format, num_rows, debugstr_w(column_delimiter),
            debugstr_w(row_delimiter), debugstr_w(null_expr), ret_string );
     return E_NOTIMPL;
 }
@@ -1986,7 +1986,7 @@ static HRESULT WINAPI rsconstruction_GetTypeInfo(ADORecordsetConstruction *iface
     LCID lcid, ITypeInfo **ppTInfo)
 {
     struct recordset *recordset = impl_from_ADORecordsetConstruction( iface );
-    TRACE( "%p %u %u %p\n", recordset, iTInfo, lcid, ppTInfo );
+    TRACE( "%p %u %lu %p\n", recordset, iTInfo, lcid, ppTInfo );
     return get_typeinfo(ADORecordsetConstruction_tid, ppTInfo);
 }
 
@@ -1997,7 +1997,7 @@ static HRESULT WINAPI rsconstruction_GetIDsOfNames(ADORecordsetConstruction *ifa
     HRESULT hr;
     ITypeInfo *typeinfo;
 
-    TRACE( "%p %s %p %u %u %p\n", recordset, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId );
+    TRACE( "%p %s %p %u %lu %p\n", recordset, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId );
 
     hr = get_typeinfo(ADORecordsetConstruction_tid, &typeinfo);
     if(SUCCEEDED(hr))
@@ -2017,7 +2017,7 @@ static HRESULT WINAPI rsconstruction_Invoke(ADORecordsetConstruction *iface, DIS
     HRESULT hr;
     ITypeInfo *typeinfo;
 
-    TRACE( "%p %d %s %d %d %p %p %p %p\n", recordset, dispIdMember, debugstr_guid(riid),
+    TRACE( "%p %ld %s %ld %d %p %p %p %p\n", recordset, dispIdMember, debugstr_guid(riid),
           lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr );
 
     hr = get_typeinfo(ADORecordsetConstruction_tid, &typeinfo);
@@ -2071,7 +2071,7 @@ static HRESULT WINAPI rsconstruction_get_Chapter(ADORecordsetConstruction *iface
 static HRESULT WINAPI rsconstruction_put_Chapter(ADORecordsetConstruction *iface, ADO_LONGPTR chapter)
 {
     struct recordset *recordset = impl_from_ADORecordsetConstruction( iface );
-    FIXME( "%p, %ld\n", recordset, chapter );
+    FIXME( "%p, %Id\n", recordset, chapter );
     return E_NOTIMPL;
 }
 
diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c
index ef5de1b74f8..bd8d4972274 100644
--- a/dlls/msado15/stream.c
+++ b/dlls/msado15/stream.c
@@ -100,7 +100,7 @@ static HRESULT WINAPI stream_GetTypeInfoCount( _Stream *iface, UINT *count )
 static HRESULT WINAPI stream_GetTypeInfo( _Stream *iface, UINT index, LCID lcid, ITypeInfo **info )
 {
     struct stream *stream = impl_from_Stream( iface );
-    TRACE( "%p, %u, %u, %p\n", stream, index, lcid, info );
+    TRACE( "%p, %u, %lu, %p\n", stream, index, lcid, info );
     return get_typeinfo(Stream_tid, info);
 }
 
@@ -111,7 +111,7 @@ static HRESULT WINAPI stream_GetIDsOfNames( _Stream *iface, REFIID riid, LPOLEST
     HRESULT hr;
     ITypeInfo *typeinfo;
 
-    TRACE( "%p, %s, %p, %u, %u, %p\n", stream, debugstr_guid(riid), names, count, lcid, dispid );
+    TRACE( "%p, %s, %p, %u, %lu, %p\n", stream, debugstr_guid(riid), names, count, lcid, dispid );
 
     hr = get_typeinfo(Stream_tid, &typeinfo);
     if(SUCCEEDED(hr))
@@ -130,7 +130,7 @@ static HRESULT WINAPI stream_Invoke( _Stream *iface, DISPID member, REFIID riid,
     HRESULT hr;
     ITypeInfo *typeinfo;
 
-    TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", stream, member, debugstr_guid(riid), lcid, flags, params,
+    TRACE( "%p, %ld, %s, %ld, %d, %p, %p, %p, %p\n", stream, member, debugstr_guid(riid), lcid, flags, params,
            result, excep_info, arg_err );
 
     hr = get_typeinfo(Stream_tid, &typeinfo);
@@ -196,7 +196,7 @@ static HRESULT WINAPI stream_put_Position( _Stream *iface, ADO_LONGPTR pos )
     struct stream *stream = impl_from_Stream( iface );
     HRESULT hr;
 
-    TRACE( "%p, %ld\n", stream, pos );
+    TRACE( "%p, %Id\n", stream, pos );
 
     if (stream->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed );
     if (pos < 0) return MAKE_ADO_HRESULT( adErrInvalidArgument );
@@ -326,7 +326,7 @@ static HRESULT WINAPI stream_Read( _Stream *iface, LONG size, VARIANT *val )
     struct stream *stream = impl_from_Stream( iface );
     HRESULT hr;
 
-    TRACE( "%p, %d, %p\n", stream, size, val );
+    TRACE( "%p, %ld, %p\n", stream, size, val );
 
     if (stream->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed );
     if (stream->type != adTypeBinary) return MAKE_ADO_HRESULT( adErrIllegalOperation );
@@ -408,7 +408,7 @@ static HRESULT WINAPI stream_SetEOS( _Stream *iface )
 
 static HRESULT WINAPI stream_CopyTo( _Stream *iface, _Stream *dst, ADO_LONGPTR size )
 {
-    FIXME( "%p, %p, %ld\n", iface, dst, size );
+    FIXME( "%p, %p, %Id\n", iface, dst, size );
     return E_NOTIMPL;
 }
 
@@ -435,7 +435,7 @@ static HRESULT WINAPI stream_ReadText( _Stream *iface, LONG len, BSTR *ret )
     struct stream *stream = impl_from_Stream( iface );
     BSTR str;
 
-    TRACE( "%p, %d, %p\n", stream, len, ret );
+    TRACE( "%p, %ld, %p\n", stream, len, ret );
     if (len == adReadLine)
     {
         FIXME( "adReadLine not supported\n" );