diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in
index 89c209ab183..48a43646491 100644
--- a/dlls/wbemprox/Makefile.in
+++ b/dlls/wbemprox/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = wbemprox.dll
 IMPORTS   = winspool version iphlpapi dxgi oleaut32 ole32 advapi32 user32 gdi32 ws2_32 rpcrt4 setupapi
 
diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c
index 050e9462a4c..fb6fb654400 100644
--- a/dlls/wbemprox/builtin.c
+++ b/dlls/wbemprox/builtin.c
@@ -3128,7 +3128,8 @@ static enum fill_status fill_printer( struct table *table, const struct expr *co
     struct record_printer *rec;
     enum fill_status status = FILL_STATUS_UNFILTERED;
     PRINTER_INFO_2W *info;
-    DWORD i, offset = 0, count = 0, size = 0, num_rows = 0;
+    DWORD i, offset = 0, count = 0, size = 0;
+    UINT num_rows = 0;
     WCHAR id[20];
 
     EnumPrintersW( PRINTER_ENUM_LOCAL, NULL, 2, NULL, 0, &size, &count );
@@ -3656,7 +3657,7 @@ static const WCHAR *get_service_type( DWORD type )
     else if (type & SERVICE_FILE_SYSTEM_DRIVER)  return L"File System Driver";
     else if (type & SERVICE_WIN32_OWN_PROCESS)   return L"Own Process";
     else if (type & SERVICE_WIN32_SHARE_PROCESS) return L"Share Process";
-    else ERR("unhandled type 0x%08x\n", type);
+    else ERR( "unhandled type %#lx\n", type );
     return NULL;
 }
 static const WCHAR *get_service_state( DWORD state )
@@ -3668,7 +3669,7 @@ static const WCHAR *get_service_state( DWORD state )
     case SERVICE_STOP_PENDING:  return L"Stop Pending";
     case SERVICE_RUNNING:       return L"Running";
     default:
-        ERR("unknown state %u\n", state);
+        ERR( "unknown state %lu\n", state );
         return L"Unknown";
     }
 }
@@ -3682,7 +3683,7 @@ static const WCHAR *get_service_startmode( DWORD mode )
     case SERVICE_DEMAND_START: return L"Manual";
     case SERVICE_DISABLED:     return L"Disabled";
     default:
-        ERR("unknown mode 0x%x\n", mode);
+        ERR( "unknown mode %#lx\n", mode );
         return L"Unknown";
     }
 }
diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c
index 6f93c58a0df..37150769816 100644
--- a/dlls/wbemprox/class.c
+++ b/dlls/wbemprox/class.c
@@ -119,7 +119,7 @@ static HRESULT WINAPI enum_class_object_Next(
     HRESULT hr;
     ULONG i, j;
 
-    TRACE("%p, %d, %u, %p, %p\n", iface, lTimeout, uCount, apObjects, puReturned);
+    TRACE( "%p, %ld, %lu, %p, %p\n", iface, lTimeout, uCount, apObjects, puReturned );
 
     if (!apObjects || !puReturned) return WBEM_E_INVALID_PARAMETER;
     if (lTimeout != WBEM_INFINITE && !once++) FIXME("timeout not supported\n");
@@ -148,7 +148,7 @@ static HRESULT WINAPI enum_class_object_NextAsync(
     ULONG uCount,
     IWbemObjectSink *pSink )
 {
-    FIXME("%p, %u, %p\n", iface, uCount, pSink);
+    FIXME( "%p, %lu, %p\n", iface, uCount, pSink );
     return E_NOTIMPL;
 }
 
@@ -172,7 +172,7 @@ static HRESULT WINAPI enum_class_object_Skip(
     struct view *view = ec->query->view;
     static int once = 0;
 
-    TRACE("%p, %d, %u\n", iface, lTimeout, nCount);
+    TRACE( "%p, %ld, %lu\n", iface, lTimeout, nCount );
 
     if (lTimeout != WBEM_INFINITE && !once++) FIXME("timeout not supported\n");
 
@@ -396,7 +396,7 @@ static HRESULT WINAPI class_object_Get(
     struct class_object *co = impl_from_IWbemClassObject( iface );
     struct enum_class_object *ec = impl_from_IEnumWbemClassObject( co->iter );
 
-    TRACE("%p, %s, %08x, %p, %p, %p\n", iface, debugstr_w(wszName), lFlags, pVal, pType, plFlavor);
+    TRACE( "%p, %s, %#lx, %p, %p, %p\n", iface, debugstr_w(wszName), lFlags, pVal, pType, plFlavor );
 
     if (co->record)
     {
@@ -437,7 +437,7 @@ static HRESULT record_set_value( struct record *record, UINT index, VARIANT *var
         record->fields[index].u.ival = val;
         return S_OK;
     default:
-        FIXME("unhandled type %u\n", type);
+        FIXME( "unhandled type %lu\n", type );
         break;
     }
     return WBEM_E_INVALID_PARAMETER;
@@ -453,7 +453,7 @@ static HRESULT WINAPI class_object_Put(
     struct class_object *co = impl_from_IWbemClassObject( iface );
     struct enum_class_object *ec = impl_from_IEnumWbemClassObject( co->iter );
 
-    TRACE("%p, %s, %08x, %p, %u\n", iface, debugstr_w(wszName), lFlags, pVal, Type);
+    TRACE( "%p, %s, %#lx, %p, %lu\n", iface, debugstr_w(wszName), lFlags, pVal, Type );
 
     if (co->record)
     {
@@ -487,7 +487,7 @@ static HRESULT WINAPI class_object_GetNames(
     struct class_object *co = impl_from_IWbemClassObject( iface );
     struct enum_class_object *ec = impl_from_IEnumWbemClassObject( co->iter );
 
-    TRACE("%p, %s, %08x, %s, %p\n", iface, debugstr_w(wszQualifierName), lFlags,
+    TRACE( "%p, %s, %#lx, %s, %p\n", iface, debugstr_w(wszQualifierName), lFlags,
           debugstr_variant(pQualifierVal), pNames);
 
     if (!pNames)
@@ -501,7 +501,7 @@ static HRESULT WINAPI class_object_GetNames(
         lFlags != WBEM_FLAG_NONSYSTEM_ONLY &&
         lFlags != WBEM_FLAG_SYSTEM_ONLY))
     {
-        FIXME("flags %08x not supported\n", lFlags);
+        FIXME( "flags %#lx not supported\n", lFlags );
         return E_NOTIMPL;
     }
 
@@ -517,9 +517,9 @@ static HRESULT WINAPI class_object_BeginEnumeration(
 {
     struct class_object *co = impl_from_IWbemClassObject( iface );
 
-    TRACE("%p, %08x\n", iface, lEnumFlags);
+    TRACE( "%p, %#lx\n", iface, lEnumFlags );
 
-    if (lEnumFlags) FIXME("flags 0x%08x not supported\n", lEnumFlags);
+    if (lEnumFlags) FIXME( "flags %#lx not supported\n", lEnumFlags );
 
     co->index_property = 0;
     return S_OK;
@@ -541,7 +541,7 @@ static HRESULT WINAPI class_object_Next(
     HRESULT hr;
     UINT i;
 
-    TRACE("%p, %08x, %p, %p, %p, %p\n", iface, lFlags, strName, pVal, pType, plFlavor);
+    TRACE( "%p, %#lx, %p, %p, %p, %p\n", iface, lFlags, strName, pVal, pType, plFlavor );
 
     for (i = obj->index_property; i < table->num_cols; i++)
     {
@@ -661,9 +661,9 @@ static HRESULT WINAPI class_object_GetObjectText(
     struct view *view = ec->query->view;
     BSTR text;
 
-    TRACE("%p, %08x, %p\n", iface, lFlags, pstrObjectText);
+    TRACE( "%p, %#lx, %p\n", iface, lFlags, pstrObjectText );
 
-    if (lFlags) FIXME("flags %08x not implemented\n", lFlags);
+    if (lFlags) FIXME( "flags %#lx not implemented\n", lFlags );
 
     if (!(text = get_object_text( view, co->index ))) return E_OUTOFMEMORY;
     *pstrObjectText = text;
@@ -675,7 +675,7 @@ static HRESULT WINAPI class_object_SpawnDerivedClass(
     LONG lFlags,
     IWbemClassObject **ppNewClass )
 {
-    FIXME("%p, %08x, %p\n", iface, lFlags, ppNewClass);
+    FIXME( "%p, %#lx, %p\n", iface, lFlags, ppNewClass );
     return E_NOTIMPL;
 }
 
@@ -691,7 +691,7 @@ static HRESULT WINAPI class_object_SpawnInstance(
     struct record *record;
     HRESULT hr;
 
-    TRACE("%p, %08x, %p\n", iface, lFlags, ppNewInstance);
+    TRACE( "%p, %#lx, %p\n", iface, lFlags, ppNewInstance );
 
     if (!(record = create_record( table ))) return E_OUTOFMEMORY;
     if (FAILED(hr = IEnumWbemClassObject_Clone( co->iter, &iter )))
@@ -709,7 +709,7 @@ static HRESULT WINAPI class_object_CompareTo(
     LONG lFlags,
     IWbemClassObject *pCompareTo )
 {
-    FIXME("%p, %08x, %p\n", iface, lFlags, pCompareTo);
+    FIXME( "%p, %#lx, %p\n", iface, lFlags, pCompareTo );
     return E_NOTIMPL;
 }
 
@@ -755,7 +755,7 @@ static void set_default_value( CIMTYPE type, UINT val, BYTE *ptr )
         *(UINT32 *)ptr = val;
         break;
     default:
-        FIXME("unhandled type %u\n", type);
+        FIXME( "unhandled type %lu\n", type );
         break;
     }
 }
@@ -892,7 +892,7 @@ static HRESULT WINAPI class_object_GetMethod(
     unsigned int i;
     HRESULT hr;
 
-    TRACE("%p, %s, %08x, %p, %p\n", iface, debugstr_w(wszName), lFlags, ppInSignature, ppOutSignature);
+    TRACE( "%p, %s, %#lx, %p, %p\n", iface, debugstr_w(wszName), lFlags, ppInSignature, ppOutSignature );
 
     if (ppInSignature) *ppInSignature = NULL;
     if (ppOutSignature) *ppOutSignature = NULL;
@@ -931,7 +931,7 @@ static HRESULT WINAPI class_object_PutMethod(
     IWbemClassObject *pInSignature,
     IWbemClassObject *pOutSignature )
 {
-    FIXME("%p, %s, %08x, %p, %p\n", iface, debugstr_w(wszName), lFlags, pInSignature, pOutSignature);
+    FIXME( "%p, %s, %#lx, %p, %p\n", iface, debugstr_w(wszName), lFlags, pInSignature, pOutSignature );
     return E_NOTIMPL;
 }
 
@@ -949,9 +949,9 @@ static HRESULT WINAPI class_object_BeginMethodEnumeration(
 {
     struct class_object *co = impl_from_IWbemClassObject( iface );
 
-    TRACE("%p, %08x\n", iface, lEnumFlags);
+    TRACE( "%p, %#lx\n", iface, lEnumFlags );
 
-    if (lEnumFlags) FIXME("flags 0x%08x not supported\n", lEnumFlags);
+    if (lEnumFlags) FIXME( "flags %#lx not supported\n", lEnumFlags );
 
     co->index_method = 0;
     return S_OK;
@@ -968,7 +968,7 @@ static HRESULT WINAPI class_object_NextMethod(
     BSTR method;
     HRESULT hr;
 
-    TRACE("%p, %08x, %p, %p, %p\n", iface, lFlags, pstrName, ppInSignature, ppOutSignature);
+    TRACE( "%p, %#lx, %p, %p, %p\n", iface, lFlags, pstrName, ppInSignature, ppOutSignature );
 
     if (!(method = get_method_name( co->ns, co->name, co->index_method ))) return WBEM_S_NO_MORE_DATA;
 
diff --git a/dlls/wbemprox/process.c b/dlls/wbemprox/process.c
index 93136e9aefc..0fdd9340d16 100644
--- a/dlls/wbemprox/process.c
+++ b/dlls/wbemprox/process.c
@@ -135,19 +135,19 @@ HRESULT process_create( IWbemClassObject *obj, IWbemContext *context, IWbemClass
 
     if (FAILED(hr = IWbemClassObject_Get( in, L"CommandLine", 0, &command_line, &type, NULL ))
             || V_VT( &command_line ) != VT_BSTR)
-        WARN( "Invalid CommandLine, hr %#x, type %u.\n", hr, V_VT( &command_line ));
+        WARN( "invalid CommandLine, hr %#lx, type %u\n", hr, V_VT( &command_line ));
     else
         TRACE( "CommandLine %s.\n", debugstr_w( V_BSTR( &command_line )));
 
     if (FAILED(hr = IWbemClassObject_Get( in, L"CurrentDirectory", 0, &current_directory, &type, NULL ))
             || V_VT( &current_directory ) != VT_BSTR)
-        WARN("Invalid CurrentDirectory, hr %#x, type %u.\n", hr, V_VT( &current_directory ));
+        WARN("invalid CurrentDirectory, hr %#lx, type %u\n", hr, V_VT( &current_directory ));
     else
         TRACE( "CurrentDirectory %s.\n", debugstr_w( V_BSTR( &current_directory )));
 
     if (SUCCEEDED(IWbemClassObject_Get( in, L"ProcessStartupInformation", 0, &startup_info, &type, NULL ))
             && V_VT( &startup_info ) == VT_UNKNOWN && V_UNKNOWN( &startup_info ))
-        FIXME( "ProcessStartupInformation is not implemented, vt_type %u, type %u, val %p.\n",
+        FIXME( "ProcessStartupInformation is not implemented, vt_type %u, type %lu, val %p\n",
                 V_VT( &startup_info ), type, V_UNKNOWN( &startup_info ));
 
     if (out && (hr = IWbemClassObject_SpawnInstance( sig, 0, &out_params )))
@@ -164,7 +164,7 @@ HRESULT process_create( IWbemClassObject *obj, IWbemContext *context, IWbemClass
         bret = CreateProcessW( NULL, V_BSTR( &command_line ), NULL, NULL, FALSE, 0L,
                 V_VT( &current_directory ) == VT_BSTR ? V_BSTR( &current_directory ) : NULL,
                 NULL, &si, &pi );
-        TRACE( "CreateProcessW ret %#x, GetLastError() %u.\n", bret, GetLastError() );
+        TRACE( "CreateProcessW ret %d, GetLastError() %lu\n", bret, GetLastError() );
         if (bret)
         {
             CloseHandle( pi.hThread );
@@ -217,6 +217,6 @@ done:
     VariantClear( &command_line );
     VariantClear( &current_directory );
     VariantClear( &startup_info );
-    TRACE( "ret %#x.\n", ret );
+    TRACE( "ret %#lx\n", ret );
     return ret;
 }
diff --git a/dlls/wbemprox/qualifier.c b/dlls/wbemprox/qualifier.c
index aa032388759..826c48e9d93 100644
--- a/dlls/wbemprox/qualifier.c
+++ b/dlls/wbemprox/qualifier.c
@@ -159,7 +159,7 @@ static HRESULT get_qualifier_value( enum wbm_namespace ns, const WCHAR *class, c
         hr = IWbemClassObject_Get( obj, L"BoolValue", 0, val, NULL, NULL );
         break;
     default:
-        ERR("unhandled type %u\n", V_UI4( &var ));
+        ERR( "unhandled type %lu\n", V_UI4( &var ) );
         break;
     }
 
@@ -177,10 +177,10 @@ static HRESULT WINAPI qualifier_set_Get(
 {
     struct qualifier_set *set = impl_from_IWbemQualifierSet( iface );
 
-    TRACE("%p, %s, %08x, %p, %p\n", iface, debugstr_w(wszName), lFlags, pVal, plFlavor);
+    TRACE( "%p, %s, %#lx, %p, %p\n", iface, debugstr_w(wszName), lFlags, pVal, plFlavor );
     if (lFlags)
     {
-        FIXME("flags %08x not supported\n", lFlags);
+        FIXME( "flags %#lx not supported\n", lFlags );
         return E_NOTIMPL;
     }
     return get_qualifier_value( set->ns, set->class, set->member, wszName, pVal, plFlavor );
@@ -192,7 +192,7 @@ static HRESULT WINAPI qualifier_set_Put(
     VARIANT *pVal,
     LONG lFlavor )
 {
-    FIXME("%p, %s, %p, %d\n", iface, debugstr_w(wszName), pVal, lFlavor);
+    FIXME( "%p, %s, %p, %ld\n", iface, debugstr_w(wszName), pVal, lFlavor );
     return E_NOTIMPL;
 }
 
@@ -214,10 +214,10 @@ static HRESULT WINAPI qualifier_set_GetNames(
     IWbemClassObject *obj;
     HRESULT hr;
 
-    TRACE("%p, %08x, %p\n", iface, lFlags, pNames);
+    TRACE( "%p, %#lx, %p\n", iface, lFlags, pNames );
     if (lFlags)
     {
-        FIXME("flags %08x not supported\n", lFlags);
+        FIXME( "flags %#lx not supported\n", lFlags );
         return E_NOTIMPL;
     }
 
@@ -237,7 +237,7 @@ static HRESULT WINAPI qualifier_set_BeginEnumeration(
     IWbemQualifierSet *iface,
     LONG lFlags )
 {
-    FIXME("%p, %08x\n", iface, lFlags);
+    FIXME( "%p, %#lx\n", iface, lFlags );
     return E_NOTIMPL;
 }
 
@@ -248,7 +248,7 @@ static HRESULT WINAPI qualifier_set_Next(
     VARIANT *pVal,
     LONG *plFlavor )
 {
-    FIXME("%p, %08x, %p, %p, %p\n", iface, lFlags, pstrName, pVal, plFlavor);
+    FIXME( "%p, %#lx, %p, %p, %p\n", iface, lFlags, pstrName, pVal, plFlavor );
     return E_NOTIMPL;
 }
 
diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c
index 56631cbca9e..d02ae82420c 100644
--- a/dlls/wbemprox/query.c
+++ b/dlls/wbemprox/query.c
@@ -300,7 +300,7 @@ static const WCHAR *format_int( WCHAR *buf, UINT len, CIMTYPE type, LONGLONG val
         return buf;
 
     default:
-        ERR( "unhandled type %u\n", type );
+        ERR( "unhandled type %lu\n", type );
         return NULL;
     }
 }
@@ -1047,7 +1047,7 @@ VARTYPE to_vartype( CIMTYPE type )
     case CIM_REAL32:    return VT_R4;
 
     default:
-        ERR("unhandled type %u\n", type);
+        ERR( "unhandled type %lu\n", type );
         break;
     }
     return 0;
diff --git a/dlls/wbemprox/reg.c b/dlls/wbemprox/reg.c
index eaa1db8bdde..81ed914ae2f 100644
--- a/dlls/wbemprox/reg.c
+++ b/dlls/wbemprox/reg.c
@@ -564,12 +564,12 @@ HRESULT reg_set_stringvalue( IWbemClassObject *obj, IWbemContext *context, IWbem
 }
 
 static void set_dwordvalue( HKEY root, const WCHAR *subkey, const WCHAR *name, DWORD value, IWbemContext *context,
-        VARIANT *retval )
+                            VARIANT *retval )
 {
     HKEY hkey;
     LONG res;
 
-    TRACE("%p, %s, %s, %#x\n", root, debugstr_w(subkey), debugstr_w(name), value);
+    TRACE( "%p, %s, %s, %#lx\n", root, debugstr_w(subkey), debugstr_w(name), value );
 
     if ((res = RegOpenKeyExW( root, subkey, 0, KEY_SET_VALUE | reg_get_access_mask( context ), &hkey )))
     {
diff --git a/dlls/wbemprox/service.c b/dlls/wbemprox/service.c
index b0b7bce0872..a0988d83b54 100644
--- a/dlls/wbemprox/service.c
+++ b/dlls/wbemprox/service.c
@@ -45,7 +45,7 @@ static UINT map_error( DWORD error )
     case ERROR_SERVICE_REQUEST_TIMEOUT:    return 7;
     case ERROR_SERVICE_ALREADY_RUNNING:    return 10;
     default:
-        WARN("unknown error %u\n", error);
+        WARN( "unknown error %lu\n", error );
         break;
     }
     return 8;
diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c
index 5184bf4a4fa..9b9e1f37abd 100644
--- a/dlls/wbemprox/services.c
+++ b/dlls/wbemprox/services.c
@@ -122,8 +122,8 @@ static HRESULT WINAPI client_security_SetBlanket(
     const OLECHAR *princname = (pServerPrincName == COLE_DEFAULT_PRINCIPAL) ?
                                L"<COLE_DEFAULT_PRINCIPAL>" : pServerPrincName;
 
-    FIXME("%p, %p, %u, %u, %s, %u, %u, %p, 0x%08x\n", iface, pProxy, AuthnSvc, AuthzSvc,
-          debugstr_w(princname), AuthnLevel, ImpLevel, pAuthInfo, Capabilities);
+    FIXME( "%p, %p, %lu, %lu, %s, %lu, %lu, %p, %#lx\n", iface, pProxy, AuthnSvc, AuthzSvc,
+           debugstr_w(princname), AuthnLevel, ImpLevel, pAuthInfo, Capabilities );
     return WBEM_NO_ERROR;
 }
 
@@ -290,8 +290,8 @@ static HRESULT WINAPI wbem_services_OpenNamespace(
 {
     struct wbem_services *ws = impl_from_IWbemServices( iface );
 
-    TRACE("%p, %s, 0x%08x, %p, %p, %p\n", iface, debugstr_w(strNamespace), lFlags,
-          pCtx, ppWorkingNamespace, ppResult);
+    TRACE( "%p, %s, %#lx, %p, %p, %p\n", iface, debugstr_w(strNamespace), lFlags,
+           pCtx, ppWorkingNamespace, ppResult );
 
     if (ws->ns != WBEMPROX_NAMESPACE_LAST || !strNamespace)
         return WBEM_E_INVALID_NAMESPACE;
@@ -502,10 +502,10 @@ static HRESULT WINAPI wbem_services_GetObject(
 {
     struct wbem_services *services = impl_from_IWbemServices( iface );
 
-    TRACE("%p, %s, 0x%08x, %p, %p, %p\n", iface, debugstr_w(strObjectPath), lFlags,
-          pCtx, ppObject, ppCallResult);
+    TRACE( "%p, %s, %#lx, %p, %p, %p\n", iface, debugstr_w(strObjectPath), lFlags,
+           pCtx, ppObject, ppCallResult );
 
-    if (lFlags) FIXME("unsupported flags 0x%08x\n", lFlags);
+    if (lFlags) FIXME( "unsupported flags %#lx\n", lFlags );
 
     if (!strObjectPath || !strObjectPath[0])
         return create_class_object( services->ns, NULL, NULL, 0, NULL, ppObject );
@@ -645,9 +645,9 @@ static HRESULT WINAPI wbem_services_CreateInstanceEnum(
     struct path *path;
     HRESULT hr;
 
-    TRACE("%p, %s, 0%08x, %p, %p\n", iface, debugstr_w(strClass), lFlags, pCtx, ppEnum);
+    TRACE( "%p, %s, %#lx, %p, %p\n", iface, debugstr_w(strClass), lFlags, pCtx, ppEnum );
 
-    if (lFlags) FIXME("unsupported flags 0x%08x\n", lFlags);
+    if (lFlags) FIXME( "unsupported flags %#lx\n", lFlags );
 
     hr = parse_path( strClass, &path );
     if (hr != S_OK) return hr;
@@ -678,8 +678,8 @@ static HRESULT WINAPI wbem_services_ExecQuery(
 {
     struct wbem_services *services = impl_from_IWbemServices( iface );
 
-    TRACE("%p, %s, %s, 0x%08x, %p, %p\n", iface, debugstr_w(strQueryLanguage),
-          debugstr_w(strQuery), lFlags, pCtx, ppEnum);
+    TRACE( "%p, %s, %s, %#lx, %p, %p\n", iface, debugstr_w(strQueryLanguage),
+           debugstr_w(strQuery), lFlags, pCtx, ppEnum );
 
     if (!strQueryLanguage || !strQuery || !strQuery[0]) return WBEM_E_INVALID_PARAMETER;
     if (wcsicmp( strQueryLanguage, L"WQL" )) return WBEM_E_INVALID_QUERY_TYPE;
@@ -724,8 +724,8 @@ static HRESULT WINAPI wbem_services_ExecQueryAsync(
     struct async_header *async;
     struct async_query *query;
 
-    TRACE("%p, %s, %s, 0x%08x, %p, %p\n", iface, debugstr_w(strQueryLanguage), debugstr_w(strQuery),
-          lFlags, pCtx, pResponseHandler);
+    TRACE( "%p, %s, %s, %#lx, %p, %p\n", iface, debugstr_w(strQueryLanguage), debugstr_w(strQuery),
+           lFlags, pCtx, pResponseHandler );
 
     if (!pResponseHandler) return WBEM_E_INVALID_PARAMETER;
 
@@ -794,8 +794,8 @@ static HRESULT WINAPI wbem_services_ExecNotificationQueryAsync(
     struct async_header *async;
     struct async_query *query;
 
-    TRACE("%p, %s, %s, 0x%08x, %p, %p\n", iface, debugstr_w(strQueryLanguage), debugstr_w(strQuery),
-          lFlags, pCtx, pResponseHandler);
+    TRACE( "%p, %s, %s, %#lx, %p, %p\n", iface, debugstr_w(strQueryLanguage), debugstr_w(strQuery),
+           lFlags, pCtx, pResponseHandler );
 
     if (!pResponseHandler) return WBEM_E_INVALID_PARAMETER;
 
@@ -857,10 +857,10 @@ static HRESULT WINAPI wbem_services_ExecMethod(
     struct table *table;
     HRESULT hr;
 
-    TRACE("%p, %s, %s, %08x, %p, %p, %p, %p\n", iface, debugstr_w(strObjectPath),
-          debugstr_w(strMethodName), lFlags, context, pInParams, ppOutParams, ppCallResult);
+    TRACE( "%p, %s, %s, %#lx, %p, %p, %p, %p\n", iface, debugstr_w(strObjectPath),
+           debugstr_w(strMethodName), lFlags, context, pInParams, ppOutParams, ppCallResult );
 
-    if (lFlags) FIXME("flags %08x not supported\n", lFlags);
+    if (lFlags) FIXME( "flags %#lx not supported\n", lFlags );
 
     if ((hr = parse_path( strObjectPath, &path )) != S_OK) return hr;
     if (!(str = query_from_path( path )))
@@ -1084,7 +1084,7 @@ static HRESULT WINAPI wbem_context_GetNames(
     LONG flags,
     SAFEARRAY **names )
 {
-    FIXME("%p, %#x, %p\n", iface, flags, names);
+    FIXME( "%p, %#lx, %p\n", iface, flags, names );
 
     return E_NOTIMPL;
 }
@@ -1093,7 +1093,7 @@ static HRESULT WINAPI wbem_context_BeginEnumeration(
     IWbemContext *iface,
     LONG flags )
 {
-    FIXME("%p, %#x\n", iface, flags);
+    FIXME( "%p, %#lx\n", iface, flags );
 
     return E_NOTIMPL;
 }
@@ -1104,7 +1104,7 @@ static HRESULT WINAPI wbem_context_Next(
     BSTR *name,
     VARIANT *value )
 {
-    FIXME("%p, %#x, %p, %p\n", iface, flags, name, value);
+    FIXME( "%p, %#lx, %p, %p\n", iface, flags, name, value );
 
     return E_NOTIMPL;
 }
@@ -1139,7 +1139,7 @@ static HRESULT WINAPI wbem_context_SetValue(
     struct wbem_context_value *value;
     HRESULT hr;
 
-    TRACE("%p, %s, %#x, %s\n", iface, debugstr_w(name), flags, debugstr_variant(var));
+    TRACE( "%p, %s, %#lx, %s\n", iface, debugstr_w(name), flags, debugstr_variant(var) );
 
     if (!name || !var)
         return WBEM_E_INVALID_PARAMETER;
@@ -1179,7 +1179,7 @@ static HRESULT WINAPI wbem_context_GetValue(
     struct wbem_context *context = impl_from_IWbemContext( iface );
     struct wbem_context_value *value;
 
-    TRACE("%p, %s, %#x, %p\n", iface, debugstr_w(name), flags, var);
+    TRACE( "%p, %s, %#lx, %p\n", iface, debugstr_w(name), flags, var );
 
     if (!name || !var)
         return WBEM_E_INVALID_PARAMETER;
@@ -1196,7 +1196,7 @@ static HRESULT WINAPI wbem_context_DeleteValue(
     LPCWSTR name,
     LONG flags )
 {
-    FIXME("%p, %s, %#x\n", iface, debugstr_w(name), flags);
+    FIXME( "%p, %s, %#lx\n", iface, debugstr_w(name), flags );
 
     return E_NOTIMPL;
 }
diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c
index d08646a1c50..005c7678170 100644
--- a/dlls/wbemprox/table.c
+++ b/dlls/wbemprox/table.c
@@ -70,7 +70,7 @@ UINT get_type_size( CIMTYPE type )
     case CIM_REAL32:
         return sizeof(FLOAT);
     default:
-        ERR("unhandled type %u\n", type);
+        ERR( "unhandled type %lu\n", type );
         break;
     }
     return sizeof(LONGLONG);
@@ -250,7 +250,7 @@ HRESULT set_value( const struct table *table, UINT row, UINT column, LONGLONG va
         *(UINT64 *)ptr = val;
         break;
     default:
-        FIXME("unhandled column type %u\n", type);
+        FIXME( "unhandled column type %lu\n", type );
         return WBEM_E_FAILED;
     }
     return S_OK;
diff --git a/dlls/wbemprox/wbemlocator.c b/dlls/wbemprox/wbemlocator.c
index 58cb4a86991..32408cf6a90 100644
--- a/dlls/wbemprox/wbemlocator.c
+++ b/dlls/wbemprox/wbemlocator.c
@@ -165,8 +165,8 @@ static HRESULT WINAPI wbem_locator_ConnectServer(
     HRESULT hr;
     WCHAR *server, *namespace;
 
-    TRACE("%p, %s, %s, %s, %s, 0x%08x, %s, %p, %p)\n", iface, debugstr_w(NetworkResource), debugstr_w(User),
-          debugstr_w(Password), debugstr_w(Locale), SecurityFlags, debugstr_w(Authority), context, ppNamespace);
+    TRACE( "%p, %s, %s, %s, %s, %#lx, %s, %p, %p)\n", iface, debugstr_w(NetworkResource), debugstr_w(User),
+           debugstr_w(Password), debugstr_w(Locale), SecurityFlags, debugstr_w(Authority), context, ppNamespace );
 
     hr = parse_resource( NetworkResource, &server, &namespace );
     if (hr != S_OK) return hr;