ole32: Build without WINE_NO_LONG_TYPES.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ole32: Build without WINE_NO_LONG_TYPES.
233042bd · Nikolay Sivov · Alexandre Julliard · 576cdea0 · 233042bd · 233042bd
Commit 233042bd authored Feb 08, 2022 by Nikolay Sivov Committed by Alexandre Julliard Feb 09, 2022
24 changed files
--- a/dlls/ole32/Makefile.in
+++ b/dlls/ole32/Makefile.in
@@ -2,7 +2,7 @@ MODULE    = ole32.dll
 IMPORTLIB = ole32
 IMPORTS   = uuid advapi32 user32 gdi32 combase rpcrt4 kernelbase
 DELAYIMPORTS = oleaut32
-EXTRADEFS = -DWINE_NO_LONG_TYPES -D_OLE32_
+EXTRADEFS = -D_OLE32_
 C_SRCS = \
 	antimoniker.c \

--- a/dlls/ole32/antimoniker.c
+++ b/dlls/ole32/antimoniker.c
@@ -122,7 +122,7 @@ static ULONG WINAPI AntiMonikerImpl_AddRef(IMoniker *iface)
    AntiMonikerImpl *moniker = impl_from_IMoniker(iface);
    ULONG refcount = InterlockedIncrement(&moniker->refcount);
-    TRACE("%p, refcount %u.\n", iface, refcount);
+    TRACE("%p, refcount %lu.\n", iface, refcount);
    return refcount;
 }
@@ -135,7 +135,7 @@ static ULONG WINAPI AntiMonikerImpl_Release(IMoniker *iface)
    AntiMonikerImpl *moniker = impl_from_IMoniker(iface);
    ULONG refcount = InterlockedDecrement(&moniker->refcount);
-    TRACE("%p, refcount %u.\n", iface, refcount);
+    TRACE("%p, refcount %lu.\n", iface, refcount);
    if (!refcount)
    {
@@ -261,14 +261,11 @@ AntiMonikerImpl_BindToStorage(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLef
    return E_NOTIMPL;
 }
-/******************************************************************************
- *        AntiMoniker_Reduce
- ******************************************************************************/
 static HRESULT WINAPI
 AntiMonikerImpl_Reduce(IMoniker* iface, IBindCtx* pbc, DWORD dwReduceHowFar,
                       IMoniker** ppmkToLeft, IMoniker** ppmkReduced)
 {
-    TRACE("(%p,%p,%d,%p,%p)\n",iface,pbc,dwReduceHowFar,ppmkToLeft,ppmkReduced);
+    TRACE("%p, %p, %ld, %p, %p.\n", iface, pbc, dwReduceHowFar, ppmkToLeft, ppmkReduced);
    if (ppmkReduced==NULL)
        return E_POINTER;
@@ -556,7 +553,7 @@ AntiMonikerROTDataImpl_GetComparisonData(IROTData *iface, BYTE *data, ULONG data
 {
    AntiMonikerImpl *moniker = impl_from_IROTData(iface);
-    TRACE("%p, %p, %u, %p.\n", iface, data, data_len, data_req);
+    TRACE("%p, %p, %lu, %p.\n", iface, data, data_len, data_req);
    *data_req = sizeof(CLSID) + sizeof(DWORD);
    if (data_len < *data_req)

--- a/dlls/ole32/bindctx.c
+++ b/dlls/ole32/bindctx.c
@@ -118,7 +118,7 @@ static ULONG WINAPI BindCtxImpl_Release(IBindCtx* iface)
    BindCtxImpl *context = impl_from_IBindCtx(iface);
    ULONG refcount = InterlockedDecrement(&context->ref);
-    TRACE("%p refcount %d.\n", iface, refcount);
+    TRACE("%p, refcount %lu.\n", iface, refcount);
    if (!refcount)
    {
@@ -234,7 +234,7 @@ BindCtxImpl_SetBindOptions(IBindCtx* iface,BIND_OPTS *pbindopts)
    if (pbindopts->cbStruct > sizeof(This->options))
    {
-        WARN("invalid size %u.\n", pbindopts->cbStruct);
+        WARN("invalid size %lu.\n", pbindopts->cbStruct);
        return E_INVALIDARG;
    }
    memcpy(&This->options, pbindopts, pbindopts->cbStruct);
@@ -492,7 +492,7 @@ HRESULT WINAPI CreateBindCtx(DWORD reserved, IBindCtx **bind_context)
 {
    BindCtxImpl *object;
-    TRACE("%#x, %p\n", reserved, bind_context);
+    TRACE("%#lx, %p.\n", reserved, bind_context);
    if (!bind_context) return E_INVALIDARG;
@@ -500,7 +500,7 @@ HRESULT WINAPI CreateBindCtx(DWORD reserved, IBindCtx **bind_context)
    if (reserved)
    {
-        WARN("reserved should be 0, not 0x%x\n", reserved);
+        WARN("reserved should be 0, not %#lx.\n", reserved);
        return E_INVALIDARG;
    }
@@ -539,7 +539,7 @@ HRESULT WINAPI BindMoniker(LPMONIKER pmk, DWORD grfOpt, REFIID riid, LPVOID * pp
    HRESULT res;
    IBindCtx * pbc;
-    TRACE("(%p, %x, %s, %p)\n", pmk, grfOpt, debugstr_guid(riid), ppvResult);
+    TRACE("%p, %lx, %s, %p.\n", pmk, grfOpt, debugstr_guid(riid), ppvResult);
    res = CreateBindCtx(grfOpt, &pbc);
    if (SUCCEEDED(res))

--- a/dlls/ole32/classmoniker.c
+++ b/dlls/ole32/classmoniker.c
@@ -133,7 +133,7 @@ static ULONG WINAPI ClassMoniker_Release(IMoniker* iface)
    ClassMoniker *moniker = impl_from_IMoniker(iface);
    ULONG ref = InterlockedDecrement(&moniker->ref);
-    TRACE("%p refcount %d\n", iface, ref);
+    TRACE("%p, refcount %lu.\n", iface, ref);
    if (!ref)
    {
@@ -190,7 +190,7 @@ static HRESULT WINAPI ClassMoniker_Load(IMoniker *iface, IStream *stream)
        heap_free(moniker->data);
        if (!(moniker->data = heap_alloc(moniker->header.data_len)))
        {
-            WARN("Failed to allocate moniker data of size %u.\n", moniker->header.data_len);
+            WARN("Failed to allocate moniker data of size %lu.\n", moniker->header.data_len);
            moniker->header.data_len = 0;
            return E_OUTOFMEMORY;
        }
@@ -278,16 +278,10 @@ static HRESULT WINAPI ClassMoniker_BindToStorage(IMoniker* iface,
    return IMoniker_BindToObject(iface, pbc, pmkToLeft, riid, ppvResult);
 }
-/******************************************************************************
+static HRESULT WINAPI ClassMoniker_Reduce(IMoniker* iface, IBindCtx *pbc,
- *        ClassMoniker_Reduce
+        DWORD dwReduceHowFar, IMoniker **ppmkToLeft, IMoniker **ppmkReduced)
- ******************************************************************************/
-static HRESULT WINAPI ClassMoniker_Reduce(IMoniker* iface,
-                                      IBindCtx* pbc,
-                                      DWORD dwReduceHowFar,
-                                      IMoniker** ppmkToLeft,
-                                      IMoniker** ppmkReduced)
 {
-    TRACE("(%p,%p,%d,%p,%p)\n",iface,pbc,dwReduceHowFar,ppmkToLeft,ppmkReduced);
+    TRACE("%p, %p, %ld, %p, %p.\n", iface, pbc, dwReduceHowFar, ppmkToLeft, ppmkReduced);
    if (!ppmkReduced)
        return E_POINTER;
@@ -547,7 +541,7 @@ static HRESULT WINAPI ClassMonikerROTData_GetComparisonData(IROTData* iface,
 {
    ClassMoniker *This = impl_from_IROTData(iface);
-    TRACE("(%p, %u, %p)\n", pbData, cbMax, pcbData);
+    TRACE("%p, %p, %lu, %p.\n", iface, pbData, cbMax, pcbData);
    *pcbData = 2*sizeof(CLSID);
    if (cbMax < *pcbData)

--- a/dlls/ole32/clipboard.c
+++ b/dlls/ole32/clipboard.c
@@ -277,7 +277,7 @@ static inline HRESULT get_ole_clipbrd(ole_clipbrd **clipbrd)
 static inline const char *dump_fmtetc(FORMATETC *fmt)
 {
    if (!fmt) return "(null)";
-    return wine_dbg_sprintf("cf %04x ptd %p aspect %x lindex %d tymed %x",
+    return wine_dbg_sprintf("cf %04x ptd %p aspect %lx lindex %ld tymed %lx",
                            fmt->cfFormat, fmt->ptd, fmt->dwAspect, fmt->lindex, fmt->tymed);
 }
@@ -338,9 +338,11 @@ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_QueryInterface
 static ULONG WINAPI OLEClipbrd_IEnumFORMATETC_AddRef(LPENUMFORMATETC iface)
 {
  enum_fmtetc *This = impl_from_IEnumFORMATETC(iface);
-  TRACE("(%p)->(count=%u)\n",This, This->ref);
+  ULONG ref = InterlockedIncrement(&This->ref);
-  return InterlockedIncrement(&This->ref);
+  TRACE("%p, refcount %lu.\n", iface, ref);
+  return ref;
 }
 /************************************************************************
@@ -351,11 +353,10 @@ static ULONG WINAPI OLEClipbrd_IEnumFORMATETC_AddRef(LPENUMFORMATETC iface)
 static ULONG WINAPI OLEClipbrd_IEnumFORMATETC_Release(LPENUMFORMATETC iface)
 {
  enum_fmtetc *This = impl_from_IEnumFORMATETC(iface);
-  ULONG ref;
+  ULONG ref = InterlockedDecrement(&This->ref);
-  TRACE("(%p)->(count=%u)\n",This, This->ref);
+  TRACE("%p, refcount %lu.\n", iface, ref);
-  ref = InterlockedDecrement(&This->ref);
  if (!ref)
  {
    TRACE("() - destroying IEnumFORMATETC(%p)\n",This);
@@ -415,7 +416,7 @@ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Next
 static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Skip(LPENUMFORMATETC iface, ULONG celt)
 {
  enum_fmtetc *This = impl_from_IEnumFORMATETC(iface);
-  TRACE("(%p)->(num=%u)\n", This, celt);
+  TRACE("%p, %lu.\n", iface, celt);
  This->pos += celt;
  if (This->pos > This->data->count)
@@ -650,7 +651,7 @@ static HRESULT render_embed_source_hack(IDataObject *data, LPFORMATETC fmt)
    if (FAILED(hr = IDataObject_GetDataHere(theOleClipboard->src_data, fmt, &std)))
    {
-        WARN("() : IDataObject_GetDataHere failed to render clipboard data! (%x)\n", hr);
+        WARN("() : IDataObject_GetDataHere failed to render clipboard data! (%lx)\n", hr);
        GlobalFree(hStorage);
        return hr;
    }
@@ -1025,7 +1026,7 @@ static HRESULT render_format(IDataObject *data, LPFORMATETC fmt)
    }
    else
    {
-        FIXME("Unhandled tymed %x\n", fmt->tymed);
+        FIXME("Unhandled tymed %lx\n", fmt->tymed);
        hr = DV_E_FORMATETC;
    }
@@ -1089,10 +1090,11 @@ static HRESULT WINAPI snapshot_QueryInterface(IDataObject *iface,
 static ULONG WINAPI snapshot_AddRef(IDataObject *iface)
 {
    snapshot *This = impl_from_IDataObject(iface);
+    ULONG ref = InterlockedIncrement(&This->ref);
-    TRACE("(%p)->(count=%u)\n", This, This->ref);
+    TRACE("%p, refcount %lu.\n", iface, ref);
-    return InterlockedIncrement(&This->ref);
+    return ref;
 }
 /************************************************************************
@@ -1101,11 +1103,9 @@ static ULONG WINAPI snapshot_AddRef(IDataObject *iface)
 static ULONG WINAPI snapshot_Release(IDataObject *iface)
 {
    snapshot *This = impl_from_IDataObject(iface);
-    ULONG ref;
+    ULONG ref = InterlockedDecrement(&This->ref);
-    TRACE("(%p)->(count=%u)\n", This, This->ref);
-    ref = InterlockedDecrement(&This->ref);
+    TRACE("%p, refcount %lu.\n", iface, ref);
    if (ref == 0)
    {
@@ -1263,7 +1263,7 @@ static HRESULT get_priv_data(ole_priv_data **data)
            else
                TRACE("cf %04x\n", cf);
        }
-        TRACE("count %d\n", count);
+        TRACE("count %ld\n", count);
        size += count * sizeof(ret->entries[0]);
        /* There are holes in fmtetc so zero init */
@@ -1532,7 +1532,7 @@ static HRESULT WINAPI snapshot_GetData(IDataObject *iface, FORMATETC *fmt,
        hr = get_stgmed_for_bitmap((HBITMAP)h, med);
    else
    {
-        FIXME("Unhandled tymed - mask %x req tymed %x\n", mask, fmt->tymed);
+        FIXME("Unhandled tymed - mask %lx req tymed %lx\n", mask, fmt->tymed);
        hr = E_FAIL;
        goto end;
    }
@@ -1558,7 +1558,7 @@ static HRESULT WINAPI snapshot_GetDataHere(IDataObject *iface, FORMATETC *fmt,
    if ( !fmt || !med ) return E_INVALIDARG;
-    TRACE("(%p, %p {%s}, %p (tymed %x)\n", iface, fmt, dump_fmtetc(fmt), med, med->tymed);
+    TRACE("%p, %p {%s}, %p (tymed %lx)\n", iface, fmt, dump_fmtetc(fmt), med, med->tymed);
    if ( !OpenClipboard(NULL)) return CLIPBRD_E_CANT_OPEN;
@@ -1642,7 +1642,7 @@ static HRESULT WINAPI snapshot_GetDataHere(IDataObject *iface, FORMATETC *fmt,
        break;
    }
    default:
-        FIXME("Unhandled tymed - supported %x req tymed %x\n", supported, med->tymed);
+        FIXME("Unhandled tymed - supported %x req tymed %lx\n", supported, med->tymed);
        hr = E_FAIL;
        goto end;
    }
@@ -1710,7 +1710,7 @@ static HRESULT WINAPI snapshot_EnumFormatEtc(IDataObject *iface, DWORD dir,
    HRESULT hr;
    ole_priv_data *data = NULL;
-    TRACE("(%p, %x, %p)\n", iface, dir, enum_fmt);
+    TRACE("%p, %lx, %p.\n", iface, dir, enum_fmt);
    *enum_fmt = NULL;
@@ -1737,7 +1737,7 @@ static HRESULT WINAPI snapshot_DAdvise(IDataObject *iface, FORMATETC *fmt,
                                       DWORD flags, IAdviseSink *sink,
                                       DWORD *conn)
 {
-    TRACE("(%p, %p, %x, %p, %p): not implemented\n", iface, fmt, flags, sink, conn);
+    TRACE("%p, %p, %lx, %p, %p.\n", iface, fmt, flags, sink, conn);
    return E_NOTIMPL;
 }
@@ -1748,7 +1748,7 @@ static HRESULT WINAPI snapshot_DAdvise(IDataObject *iface, FORMATETC *fmt,
 */
 static HRESULT WINAPI snapshot_DUnadvise(IDataObject* iface, DWORD conn)
 {
-    TRACE("(%p, %d): not implemented\n", iface, conn);
+    TRACE("%p, %ld.\n", iface, conn);
    return E_NOTIMPL;
 }

--- a/dlls/ole32/comcat.c
+++ b/dlls/ole32/comcat.c
@@ -505,7 +505,7 @@ static HRESULT WINAPI COMCAT_ICatInformation_GetCategoryDesc(
    HKEY key;
    HRESULT res;
-    TRACE("CATID: %s LCID: %x\n",debugstr_guid(rcatid), lcid);
+    TRACE("CATID: %s LCID: %lx\n",debugstr_guid(rcatid), lcid);
    if (rcatid == NULL || ppszDesc == NULL) return E_INVALIDARG;
@@ -589,10 +589,10 @@ static HRESULT WINAPI COMCAT_ICatInformation_IsClassOfCategories(
    if (TRACE_ON(ole)) {
 	ULONG count;
-	TRACE("CLSID: %s Implemented %u\n",debugstr_guid(rclsid),cImplemented);
+	TRACE("CLSID: %s Implemented %lu\n",debugstr_guid(rclsid),cImplemented);
 	for (count = 0; count < cImplemented; ++count)
 	    TRACE("    %s\n",debugstr_guid(&rgcatidImpl[count]));
-	TRACE("Required %u\n",cRequired);
+	TRACE("Required %lu\n",cRequired);
 	for (count = 0; count < cRequired; ++count)
 	    TRACE("    %s\n",debugstr_guid(&rgcatidReq[count]));
    }

--- a/dlls/ole32/compobj.c
+++ b/dlls/ole32/compobj.c
@@ -373,7 +373,7 @@ static ULONG WINAPI ISynchronize_fnAddRef(ISynchronize *iface)
 {
    MREImpl *This = impl_from_ISynchronize(iface);
    LONG ref = InterlockedIncrement(&This->ref);
-    TRACE("%p - ref %d\n", This, ref);
+    TRACE("%p, refcount %ld.\n", iface, ref);
    return ref;
 }
@@ -382,7 +382,7 @@ static ULONG WINAPI ISynchronize_fnRelease(ISynchronize *iface)
 {
    MREImpl *This = impl_from_ISynchronize(iface);
    LONG ref = InterlockedDecrement(&This->ref);
-    TRACE("%p - ref %d\n", This, ref);
+    TRACE("%p, refcount %ld.\n", iface, ref);
    if(!ref)
    {
@@ -397,7 +397,7 @@ static HRESULT WINAPI ISynchronize_fnWait(ISynchronize *iface, DWORD dwFlags, DW
 {
    MREImpl *This = impl_from_ISynchronize(iface);
    DWORD index;
-    TRACE("%p (%08x, %08x)\n", This, dwFlags, dwMilliseconds);
+    TRACE("%p, %#lx, %#lx.\n", iface, dwFlags, dwMilliseconds);
    return CoWaitForMultipleHandles(dwFlags, dwMilliseconds, 1, &This->event, &index);
 }
@@ -929,7 +929,7 @@ HRESULT Handler_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
 */
 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID reserved)
 {
-    TRACE("%p 0x%x %p\n", hinstDLL, fdwReason, reserved);
+    TRACE("%p, %#lx, %p.\n", hinstDLL, fdwReason, reserved);
    switch(fdwReason) {
    case DLL_PROCESS_ATTACH:

--- a/dlls/ole32/compositemoniker.c
+++ b/dlls/ole32/compositemoniker.c
@@ -147,7 +147,7 @@ static ULONG WINAPI CompositeMonikerImpl_Release(IMoniker* iface)
    CompositeMonikerImpl *moniker = impl_from_IMoniker(iface);
    ULONG refcount = InterlockedDecrement(&moniker->ref);
-    TRACE("%p, refcount %u\n", iface, refcount);
+    TRACE("%p, refcount %lu\n", iface, refcount);
    if (!refcount)
    {
@@ -205,13 +205,13 @@ static HRESULT WINAPI CompositeMonikerImpl_Load(IMoniker *iface, IStream *stream
    hr = IStream_Read(stream, &count, sizeof(DWORD), NULL);
    if (hr != S_OK)
    {
-        WARN("Failed to read component count, hr %#x.\n", hr);
+        WARN("Failed to read component count, hr %#lx.\n", hr);
        return hr;
    }
    if (count < 2)
    {
-        WARN("Unexpected component count %u.\n", count);
+        WARN("Unexpected component count %lu.\n", count);
        return E_UNEXPECTED;
    }
@@ -222,7 +222,7 @@ static HRESULT WINAPI CompositeMonikerImpl_Load(IMoniker *iface, IStream *stream
    {
        if (FAILED(hr = OleLoadFromStream(stream, &IID_IMoniker, (void **)&m)))
        {
-            WARN("Failed to initialize component %u, hr %#x.\n", i, hr);
+            WARN("Failed to initialize component %lu, hr %#lx.\n", i, hr);
            IMoniker_Release(last);
            return hr;
        }
@@ -416,7 +416,7 @@ static HRESULT WINAPI CompositeMonikerImpl_Reduce(IMoniker *iface, IBindCtx *pbc
    BOOL was_reduced;
    HRESULT hr;
-    TRACE("%p, %p, %d, %p, %p.\n", iface, pbc, howfar, toleft, reduced);
+    TRACE("%p, %p, %ld, %p, %p.\n", iface, pbc, howfar, toleft, reduced);
    if (!pbc || !reduced)
        return E_INVALIDARG;
@@ -1021,7 +1021,7 @@ static HRESULT composite_get_moniker_comparison_data(IMoniker *moniker,
    if (FAILED(hr = IMoniker_QueryInterface(moniker, &IID_IROTData, (void **)&rot_data)))
    {
-        WARN("Failed to get IROTData for component moniker, hr %#x.\n", hr);
+        WARN("Failed to get IROTData for component moniker, hr %#lx.\n", hr);
        return hr;
    }
@@ -1038,7 +1038,7 @@ static HRESULT WINAPI CompositeMonikerROTDataImpl_GetComparisonData(IROTData *if
    HRESULT hr;
    ULONG len;
-    TRACE("%p, %p, %u, %p\n", iface, data, max_len, ret_len);
+    TRACE("%p, %p, %lu, %p\n", iface, data, max_len, ret_len);
    if (!moniker->comp_count)
        return E_UNEXPECTED;
@@ -1052,7 +1052,7 @@ static HRESULT WINAPI CompositeMonikerROTDataImpl_GetComparisonData(IROTData *if
        *ret_len += len;
    else
    {
-        WARN("Failed to get comparison data length for left component, hr %#x.\n", hr);
+        WARN("Failed to get comparison data length for left component, hr %#lx.\n", hr);
        return hr;
    }
@@ -1062,7 +1062,7 @@ static HRESULT WINAPI CompositeMonikerROTDataImpl_GetComparisonData(IROTData *if
        *ret_len += len;
    else
    {
-        WARN("Failed to get comparison data length for right component, hr %#x.\n", hr);
+        WARN("Failed to get comparison data length for right component, hr %#lx.\n", hr);
        return hr;
    }
@@ -1074,14 +1074,14 @@ static HRESULT WINAPI CompositeMonikerROTDataImpl_GetComparisonData(IROTData *if
    max_len -= sizeof(CLSID);
    if (FAILED(hr = composite_get_moniker_comparison_data(moniker->left, data, max_len, &len)))
    {
-        WARN("Failed to get comparison data for left component, hr %#x.\n", hr);
+        WARN("Failed to get comparison data for left component, hr %#lx.\n", hr);
        return hr;
    }
    data += len;
    max_len -= len;
    if (FAILED(hr = composite_get_moniker_comparison_data(moniker->right, data, max_len, &len)))
    {
-        WARN("Failed to get comparison data for right component, hr %#x.\n", hr);
+        WARN("Failed to get comparison data for right component, hr %#lx.\n", hr);
        return hr;
    }
@@ -1121,7 +1121,7 @@ static HRESULT WINAPI CompositeMonikerMarshalImpl_GetUnmarshalClass(
 {
    CompositeMonikerImpl *This = impl_from_IMarshal(iface);
-    TRACE("(%s, %p, %x, %p, %x, %p)\n", debugstr_guid(riid), pv,
+    TRACE("%s, %p, %lx, %p, %lx, %p.\n", debugstr_guid(riid), pv,
        dwDestContext, pvDestContext, mshlflags, pCid);
    return IMoniker_GetClassID(&This->IMoniker_iface, pCid);
@@ -1135,7 +1135,7 @@ static HRESULT WINAPI CompositeMonikerMarshalImpl_GetMarshalSizeMax(
    HRESULT hr;
    ULONG size;
-    TRACE("(%s, %p, %x, %p, %x, %p)\n", debugstr_guid(riid), pv,
+    TRACE("%s, %p, %lx, %p, %lx, %p.\n", debugstr_guid(riid), pv,
        dwDestContext, pvDestContext, mshlflags, pSize);
    if (!moniker->comp_count)
@@ -1166,19 +1166,19 @@ static HRESULT WINAPI CompositeMonikerMarshalImpl_MarshalInterface(IMarshal *ifa
    CompositeMonikerImpl *moniker = impl_from_IMarshal(iface);
    HRESULT hr;
-    TRACE("%p, %p, %s, %p, %x, %p, %#x\n", iface, stream, debugstr_guid(riid), pv, dwDestContext, pvDestContext, flags);
+    TRACE("%p, %p, %s, %p, %lx, %p, %#lx\n", iface, stream, debugstr_guid(riid), pv, dwDestContext, pvDestContext, flags);
    if (!moniker->comp_count)
        return E_UNEXPECTED;
    if (FAILED(hr = CoMarshalInterface(stream, &IID_IMoniker, (IUnknown *)moniker->left, dwDestContext, pvDestContext, flags)))
    {
-        WARN("Failed to marshal left component, hr %#x.\n", hr);
+        WARN("Failed to marshal left component, hr %#lx.\n", hr);
        return hr;
    }
    if (FAILED(hr = CoMarshalInterface(stream, &IID_IMoniker, (IUnknown *)moniker->right, dwDestContext, pvDestContext, flags)))
-        WARN("Failed to marshal right component, hr %#x.\n", hr);
+        WARN("Failed to marshal right component, hr %#lx.\n", hr);
    return hr;
 }
@@ -1205,13 +1205,13 @@ static HRESULT WINAPI CompositeMonikerMarshalImpl_UnmarshalInterface(IMarshal *i
    if (FAILED(hr = CoUnmarshalInterface(stream, &IID_IMoniker, (void **)&moniker->left)))
    {
-        WARN("Failed to unmarshal left moniker, hr %#x.\n", hr);
+        WARN("Failed to unmarshal left moniker, hr %#lx.\n", hr);
        return hr;
    }
    if (FAILED(hr = CoUnmarshalInterface(stream, &IID_IMoniker, (void **)&moniker->right)))
    {
-        WARN("Failed to unmarshal right moniker, hr %#x.\n", hr);
+        WARN("Failed to unmarshal right moniker, hr %#lx.\n", hr);
        return hr;
    }
@@ -1229,7 +1229,7 @@ static HRESULT WINAPI CompositeMonikerMarshalImpl_ReleaseMarshalData(IMarshal *i
 static HRESULT WINAPI CompositeMonikerMarshalImpl_DisconnectObject(IMarshal *iface,
    DWORD dwReserved)
 {
-    TRACE("(0x%x)\n", dwReserved);
+    TRACE("%#lx\n", dwReserved);
    /* can't disconnect a state-based marshal as nothing on server side to
     * disconnect from */
    return S_OK;
@@ -1286,7 +1286,7 @@ static ULONG WINAPI EnumMonikerImpl_Release(IEnumMoniker *iface)
    ULONG refcount = InterlockedDecrement(&e->ref);
    unsigned int i;
-    TRACE("%p, refcount %d.\n", iface, refcount);
+    TRACE("%p, refcount %lu.\n", iface, refcount);
    if (!refcount)
    {
@@ -1305,7 +1305,7 @@ static HRESULT WINAPI EnumMonikerImpl_Next(IEnumMoniker *iface, ULONG count,
    EnumMonikerImpl *e = impl_from_IEnumMoniker(iface);
    unsigned int i;
-    TRACE("%p, %u, %p, %p.\n", iface, count, m, fetched);
+    TRACE("%p, %lu, %p, %p.\n", iface, count, m, fetched);
    if (!m)
        return E_INVALIDARG;
@@ -1329,7 +1329,7 @@ static HRESULT WINAPI EnumMonikerImpl_Skip(IEnumMoniker *iface, ULONG count)
 {
    EnumMonikerImpl *e = impl_from_IEnumMoniker(iface);
-    TRACE("%p, %u.\n", iface, count);
+    TRACE("%p, %lu.\n", iface, count);
    if (!count)
        return S_OK;

--- a/dlls/ole32/datacache.c
+++ b/dlls/ole32/datacache.c
@@ -215,7 +215,7 @@ static inline DataCache *impl_from_IAdviseSink( IAdviseSink *iface )
 const char *debugstr_formatetc(const FORMATETC *formatetc)
 {
-    return wine_dbg_sprintf("{ cfFormat = 0x%x, ptd = %p, dwAspect = %d, lindex = %d, tymed = %d }",
+    return wine_dbg_sprintf("{ cfFormat = 0x%x, ptd = %p, dwAspect = %ld, lindex = %ld, tymed = %ld }",
        formatetc->cfFormat, formatetc->ptd, formatetc->dwAspect,
        formatetc->lindex, formatetc->tymed);
 }
@@ -353,7 +353,7 @@ static HRESULT check_valid_formatetc( const FORMATETC *fmt )
        return CACHE_S_FORMATETC_NOTSUPPORTED;
    else
    {
-        WARN("invalid clipformat/tymed combination: %d/%d\n", fmt->cfFormat, fmt->tymed);
+        WARN("invalid clipformat/tymed combination: %d/%ld\n", fmt->cfFormat, fmt->tymed);
        return DV_E_TYMED;
    }
 }
@@ -427,7 +427,7 @@ static void DataCache_FireOnViewChange(
  DWORD      aspect,
  LONG       lindex)
 {
-  TRACE("(%p, %x, %d)\n", this, aspect, lindex);
+  TRACE("%p, %lx, %ld.\n", this, aspect, lindex);
  /*
   * The sink supplies a filter when it registers
@@ -2018,7 +2018,7 @@ static HRESULT WINAPI DataCache_Draw(
  HRESULT                hres;
  DataCacheEntry        *cache_entry;
-  TRACE("(%p, %x, %d, %p, %p, %p, %p, %p, %p, %lx)\n",
+  TRACE("%p, %lx, %ld, %p, %p, %p, %p, %p, %p, %Ix.\n",
 	iface,
 	dwDrawAspect,
 	lindex,
@@ -2184,7 +2184,7 @@ static HRESULT WINAPI DataCache_SetAdvise(
 {
  DataCache *this = impl_from_IViewObject2(iface);
-  TRACE("(%p, %x, %x, %p)\n", iface, aspects, advf, pAdvSink);
+  TRACE("%p, %lx, %lx, %p.\n", iface, aspects, advf, pAdvSink);
  /*
   * A call to this function removes the previous sink
@@ -2274,8 +2274,7 @@ static HRESULT WINAPI DataCache_GetExtent(
  HRESULT                hres = E_FAIL;
  DataCacheEntry        *cache_entry;
-  TRACE("(%p, %x, %d, %p, %p)\n",
+  TRACE("%p, %lx, %ld, %p, %p.\n", iface, dwDrawAspect, lindex, ptd, lpsizel);
-	iface, dwDrawAspect, lindex, ptd, lpsizel);
  if (lpsizel==NULL)
    return E_POINTER;
@@ -2284,7 +2283,7 @@ static HRESULT WINAPI DataCache_GetExtent(
  lpsizel->cy = 0;
  if (lindex!=-1)
-    FIXME("Unimplemented flag lindex = %d\n", lindex);
+    FIXME("Unimplemented flag lindex = %ld\n", lindex);
  /*
   * Right now, we support only the callback from
@@ -2445,7 +2444,7 @@ static HRESULT WINAPI DataCache_Cache(
    HRESULT hr;
    FORMATETC fmt_cpy;
-    TRACE("(%p, 0x%x, %p)\n", pformatetc, advf, pdwConnection);
+    TRACE("%p, %#lx, %p.\n", pformatetc, advf, pdwConnection);
    if (!pformatetc || !pdwConnection)
        return E_INVALIDARG;
@@ -2496,7 +2495,7 @@ static HRESULT WINAPI DataCache_Uncache(
    DataCache *This = impl_from_IOleCache2(iface);
    DataCacheEntry *cache_entry;
-    TRACE("(%d)\n", dwConnection);
+    TRACE("%ld\n", dwConnection);
    LIST_FOR_EACH_ENTRY(cache_entry, &This->cache_list, DataCacheEntry, entry)
        if (cache_entry->id == dwConnection)
@@ -2505,7 +2504,7 @@ static HRESULT WINAPI DataCache_Uncache(
            return S_OK;
        }
-    WARN("no connection found for %d\n", dwConnection);
+    WARN("no connection found for %ld\n", dwConnection);
    return OLE_E_NOCONNECTION;
 }
@@ -2626,7 +2625,7 @@ static HRESULT WINAPI DataCache_UpdateCache( IOleCache2 *iface, IDataObject *dat
    int i, slots = 0;
    BOOL done_one = FALSE;
-    TRACE( "(%p %p %08x %p)\n", iface, data, mode, reserved );
+    TRACE("%p, %p, %#lx, %p.\n", iface, data, mode, reserved );
    LIST_FOR_EACH_ENTRY( cache_entry, &This->cache_list, DataCacheEntry, entry )
    {
@@ -2705,7 +2704,7 @@ static HRESULT WINAPI DataCache_DiscardCache(
    DataCacheEntry *cache_entry;
    HRESULT hr = S_OK;
-    TRACE("(%d)\n", dwDiscardOptions);
+    TRACE("%ld\n", dwDiscardOptions);
    if (dwDiscardOptions == DISCARDCACHE_SAVEIFDIRTY)
        hr = DataCache_Save(&This->IPersistStorage_iface, This->presentationStorage, TRUE);

--- a/dlls/ole32/defaulthandler.c
+++ b/dlls/ole32/defaulthandler.c
@@ -519,7 +519,7 @@ static HRESULT WINAPI DefaultHandler_Close(
  DefaultHandler *This = impl_from_IOleObject(iface);
  HRESULT hr;
-  TRACE("(%d)\n", dwSaveOption);
+  TRACE("%ld\n", dwSaveOption);
  if (!object_is_running(This))
    return S_OK;
@@ -548,7 +548,7 @@ static HRESULT WINAPI DefaultHandler_SetMoniker(
  DefaultHandler *This = impl_from_IOleObject(iface);
  HRESULT hr = S_OK;
-  TRACE("(%p, %d, %p)\n", iface, dwWhichMoniker, pmk);
+  TRACE("%p, %ld, %p.\n", iface, dwWhichMoniker, pmk);
  if (object_is_running(This))
  {
@@ -576,8 +576,7 @@ static HRESULT WINAPI DefaultHandler_GetMoniker(
  DefaultHandler *This = impl_from_IOleObject(iface);
  HRESULT hr;
-  TRACE("(%p, %d, %d, %p)\n",
+  TRACE("%p, %ld, %ld, %p.\n", iface, dwAssign, dwWhichMoniker, ppmk);
-	iface, dwAssign, dwWhichMoniker, ppmk);
  if (object_is_running(This))
  {
@@ -617,8 +616,7 @@ static HRESULT WINAPI DefaultHandler_InitFromData(
  DefaultHandler *This = impl_from_IOleObject(iface);
  HRESULT hr = OLE_E_NOTRUNNING;
-  TRACE("(%p, %p, %d, %d)\n",
+  TRACE("%p, %p, %d, %ld.\n", iface, pDataObject, fCreation, dwReserved);
-	iface, pDataObject, fCreation, dwReserved);
  if (object_is_running(This))
  {
@@ -646,8 +644,7 @@ static HRESULT WINAPI DefaultHandler_GetClipboardData(
  DefaultHandler *This = impl_from_IOleObject(iface);
  HRESULT hr = OLE_E_NOTRUNNING;
-  TRACE("(%p, %d, %p)\n",
+  TRACE("%p, %ld, %p.\n", iface, dwReserved, ppDataObject);
-	iface, dwReserved, ppDataObject);
  if (object_is_running(This))
  {
@@ -673,7 +670,7 @@ static HRESULT WINAPI DefaultHandler_DoVerb(
  IRunnableObject *pRunnableObj = &This->IRunnableObject_iface;
  HRESULT hr;
-  TRACE("(%d, %p, %p, %d, %p, %s)\n", iVerb, lpmsg, pActiveSite, lindex, hwndParent, wine_dbgstr_rect(lprcPosRect));
+  TRACE("%ld, %p, %p, %ld, %p, %s.\n", iVerb, lpmsg, pActiveSite, lindex, hwndParent, wine_dbgstr_rect(lprcPosRect));
  hr = IRunnableObject_Run(pRunnableObj, NULL);
  if (FAILED(hr)) return hr;
@@ -809,7 +806,7 @@ static HRESULT WINAPI DefaultHandler_GetUserType(
  DefaultHandler *This = impl_from_IOleObject(iface);
  HRESULT hr;
-  TRACE("(%p, %d, %p)\n", iface, dwFormOfType, pszUserType);
+  TRACE("%p, %ld, %p.\n", iface, dwFormOfType, pszUserType);
  if (object_is_running(This))
  {
    start_object_call( This );
@@ -836,8 +833,7 @@ static HRESULT WINAPI DefaultHandler_SetExtent(
  DefaultHandler *This = impl_from_IOleObject(iface);
  HRESULT hr = OLE_E_NOTRUNNING;
-  TRACE("(%p, %x, (%d x %d))\n", iface,
+  TRACE("%p, %lx, (%ld x %ld))\n", iface, dwDrawAspect, psizel->cx, psizel->cy);
-        dwDrawAspect, psizel->cx, psizel->cy);
  if (object_is_running(This))
  {
@@ -868,7 +864,7 @@ static HRESULT WINAPI DefaultHandler_GetExtent(
  DefaultHandler *This = impl_from_IOleObject(iface);
-  TRACE("(%p, %x, %p)\n", iface, dwDrawAspect, psizel);
+  TRACE("%p, %lx, %p.\n", iface, dwDrawAspect, psizel);
  if (object_is_running(This))
  {
@@ -947,7 +943,7 @@ static HRESULT WINAPI DefaultHandler_Unadvise(
 {
  DefaultHandler *This = impl_from_IOleObject(iface);
-  TRACE("(%p, %d)\n", iface, dwConnection);
+  TRACE("%p, %ld.\n", iface, dwConnection);
  /*
   * If we don't have an advise holder yet, it means we don't have
@@ -1003,7 +999,7 @@ static HRESULT WINAPI DefaultHandler_GetMiscStatus(
  HRESULT hres;
  DefaultHandler *This = impl_from_IOleObject(iface);
-  TRACE("(%p, %x, %p)\n", iface, dwAspect, pdwStatus);
+  TRACE("%p, %lx, %p.\n", iface, dwAspect, pdwStatus);
  if (object_is_running(This))
  {
@@ -1278,7 +1274,7 @@ static HRESULT WINAPI DefaultHandler_EnumFormatEtc(
 {
  DefaultHandler *This = impl_from_IDataObject(iface);
-  TRACE("(%p, %x, %p)\n", iface, dwDirection, ppenumFormatEtc);
+  TRACE("%p, %lx, %p.\n", iface, dwDirection, ppenumFormatEtc);
  return OleRegEnumFormatEtc(&This->clsid, dwDirection, ppenumFormatEtc);
 }
@@ -1301,8 +1297,7 @@ static HRESULT WINAPI DefaultHandler_DAdvise(
  HRESULT hres = S_OK;
  DefaultHandler *This = impl_from_IDataObject(iface);
-  TRACE("(%p, %p, %d, %p, %p)\n",
+  TRACE("%p, %p, %ld, %p, %p.\n", iface, pformatetc, advf, pAdvSink, pdwConnection);
-	iface, pformatetc, advf, pAdvSink, pdwConnection);
  /* Make sure we have a data advise holder before we start. */
  if (!This->dataAdviseHolder)
@@ -1341,7 +1336,7 @@ static HRESULT WINAPI DefaultHandler_DUnadvise(
 {
  DefaultHandler *This = impl_from_IDataObject(iface);
-  TRACE("(%p, %d)\n", iface, dwConnection);
+  TRACE("%p, %ld.\n", iface, dwConnection);
  /*
   * If we don't have a data advise holder yet, it means that
@@ -2154,7 +2149,7 @@ static DefaultHandler* DefaultHandler_Construct(
    if (SUCCEEDED(hr))
      This->object_state = object_state_running;
    if (FAILED(hr))
-      WARN("object creation failed with error %08x\n", hr);
+      WARN("object creation failed with error %#lx\n", hr);
  }
  else
  {
@@ -2241,7 +2236,7 @@ HRESULT WINAPI OleCreateEmbeddingHelper(
  DefaultHandler* newHandler = NULL;
  HRESULT         hr         = S_OK;
-  TRACE("(%s, %p, %08x, %p, %s, %p)\n", debugstr_guid(clsid), pUnkOuter, flags, pCF, debugstr_guid(riid), ppvObj);
+  TRACE("%s, %p, %#lx, %p, %s, %p.\n", debugstr_guid(clsid), pUnkOuter, flags, pCF, debugstr_guid(riid), ppvObj);
  if (!ppvObj)
    return E_POINTER;

--- a/dlls/ole32/filelockbytes.c
+++ b/dlls/ole32/filelockbytes.c
@@ -189,7 +189,7 @@ static HRESULT WINAPI FileLockBytesImpl_ReadAt(
    LARGE_INTEGER offset;
    ULONG cbRead;
-    TRACE("(%p)-> %i %p %i %p\n",This, ulOffset.u.LowPart, pv, cb, pcbRead);
+    TRACE("%p, %ld, %p, %lu, %p.\n", iface, ulOffset.u.LowPart, pv, cb, pcbRead);
    /* verify a sane environment */
    if (!This) return E_FAIL;
@@ -244,7 +244,7 @@ static HRESULT WINAPI FileLockBytesImpl_WriteAt(
    LARGE_INTEGER offset;
    ULONG cbWritten;
-    TRACE("(%p)-> %i %p %i %p\n",This, ulOffset.u.LowPart, pv, cb, pcbWritten);
+    TRACE("%p, %ld, %p, %lu, %p.\n", iface, ulOffset.u.LowPart, pv, cb, pcbWritten);
    /* verify a sane environment */
    if (!This) return E_FAIL;
@@ -297,7 +297,7 @@ static HRESULT WINAPI FileLockBytesImpl_SetSize(ILockBytes* iface, ULARGE_INTEGE
    HRESULT hr = S_OK;
    LARGE_INTEGER newpos;
-    TRACE("new size %u\n", newSize.u.LowPart);
+    TRACE("new size %lu\n", newSize.u.LowPart);
    newpos.QuadPart = newSize.QuadPart;
    if (SetFilePointerEx(This->hfile, newpos, NULL, FILE_BEGIN))
@@ -316,7 +316,7 @@ static HRESULT get_lock_error(void)
    case ERROR_ACCESS_DENIED:  return STG_E_ACCESSDENIED; break;
    case ERROR_NOT_SUPPORTED:  return STG_E_INVALIDFUNCTION; break;
    default:
-        FIXME("no mapping for error %d\n", GetLastError());
+        FIXME("no mapping for error %ld\n", GetLastError());
        return STG_E_INVALIDFUNCTION;
    }
 }
@@ -328,7 +328,7 @@ static HRESULT WINAPI FileLockBytesImpl_LockRegion(ILockBytes* iface,
    OVERLAPPED ol;
    DWORD lock_flags = LOCKFILE_FAIL_IMMEDIATELY;
-    TRACE("ofs %u count %u flags %x\n", libOffset.u.LowPart, cb.u.LowPart, dwLockType);
+    TRACE("ofs %lu count %lu flags %lx\n", libOffset.u.LowPart, cb.u.LowPart, dwLockType);
    if (dwLockType & LOCK_WRITE)
        return STG_E_INVALIDFUNCTION;
@@ -351,7 +351,7 @@ static HRESULT WINAPI FileLockBytesImpl_UnlockRegion(ILockBytes* iface,
    FileLockBytesImpl* This = impl_from_ILockBytes(iface);
    OVERLAPPED ol;
-    TRACE("ofs %u count %u flags %x\n", libOffset.u.LowPart, cb.u.LowPart, dwLockType);
+    TRACE("ofs %lu count %lu flags %lx\n", libOffset.u.LowPart, cb.u.LowPart, dwLockType);
    if (dwLockType & LOCK_WRITE)
        return STG_E_INVALIDFUNCTION;

--- a/dlls/ole32/filemoniker.c
+++ b/dlls/ole32/filemoniker.c
@@ -129,7 +129,7 @@ static ULONG WINAPI FileMonikerImpl_Release(IMoniker* iface)
    FileMonikerImpl *moniker = impl_from_IMoniker(iface);
    ULONG ref = InterlockedDecrement(&moniker->ref);
-    TRACE("(%p, refcount %d)\n", iface, ref);
+    TRACE("%p, refcount %lu.\n", iface, ref);
    if (!ref)
    {
@@ -611,7 +611,7 @@ FileMonikerImpl_BindToStorage(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLef
 static HRESULT WINAPI FileMonikerImpl_Reduce(IMoniker *iface, IBindCtx *pbc, DWORD howfar,
        IMoniker **toleft, IMoniker **reduced)
 {
-    TRACE("%p, %p, %d, %p, %p.\n", iface, pbc, howfar, toleft, reduced);
+    TRACE("%p, %p, %ld, %p, %p.\n", iface, pbc, howfar, toleft, reduced);
    if (!pbc || !reduced)
        return E_INVALIDARG;
@@ -1233,7 +1233,7 @@ FileMonikerROTDataImpl_GetComparisonData(IROTData* iface, BYTE* pbData,
    int i;
    LPWSTR pszFileName;
-    TRACE("(%p, %u, %p)\n", pbData, cbMax, pcbData);
+    TRACE("%p, %p, %lu, %p.\n", iface, pbData, cbMax, pcbData);
    *pcbData = sizeof(CLSID) + len * sizeof(WCHAR);
    if (cbMax < *pcbData)

--- a/dlls/ole32/git.c
+++ b/dlls/ole32/git.c
@@ -95,7 +95,7 @@ static StdGITEntry* StdGlobalInterfaceTable_FindEntry(StdGlobalInterfaceTableImp
 {
  StdGITEntry* e;
-  TRACE("This=%p, cookie=0x%x\n", This, cookie);
+  TRACE("%p, %#lx.\n", This, cookie);
  LIST_FOR_EACH_ENTRY(e, &This->list, StdGITEntry, entry) {
    if (e->cookie == cookie)
@@ -205,7 +205,7 @@ StdGlobalInterfaceTable_RegisterInterfaceInGlobal(
  LeaveCriticalSection(&git_section);
-  TRACE("Cookie is 0x%x\n", entry->cookie);
+  TRACE("Cookie is %#lx\n", entry->cookie);
  return S_OK;
 }
@@ -217,7 +217,7 @@ StdGlobalInterfaceTable_RevokeInterfaceFromGlobal(
  StdGITEntry* entry;
  HRESULT hr;
-  TRACE("iface=%p, dwCookie=0x%x\n", iface, dwCookie);
+  TRACE("%p, %#lx.\n", iface, dwCookie);
  EnterCriticalSection(&git_section);
@@ -236,7 +236,7 @@ StdGlobalInterfaceTable_RevokeInterfaceFromGlobal(
  hr = CoReleaseMarshalData(entry->stream);
  if (hr != S_OK)
  {
-    WARN("Failed to release marshal data, hr = 0x%08x\n", hr);
+    WARN("Failed to release marshal data, hr = %#lx\n", hr);
    return hr;
  }
  IStream_Release(entry->stream);
@@ -255,13 +255,13 @@ StdGlobalInterfaceTable_GetInterfaceFromGlobal(
  HRESULT hres;
  IStream *stream;
-  TRACE("dwCookie=0x%x, riid=%s, ppv=%p\n", dwCookie, debugstr_guid(riid), ppv);
+  TRACE("%#lx, %s, %p.\n", dwCookie, debugstr_guid(riid), ppv);
  EnterCriticalSection(&git_section);
  entry = StdGlobalInterfaceTable_FindEntry(This, dwCookie);
  if (entry == NULL) {
-    WARN("Entry for cookie 0x%x not found\n", dwCookie);
+    WARN("Entry for cookie %#lx not found\n", dwCookie);
    LeaveCriticalSection(&git_section);
    return E_INVALIDARG;
  }
@@ -273,7 +273,7 @@ StdGlobalInterfaceTable_GetInterfaceFromGlobal(
  LeaveCriticalSection(&git_section);
  if (hres != S_OK) {
-    WARN("Failed to clone stream with error 0x%08x\n", hres);
+    WARN("Failed to clone stream with error %#lx.\n", hres);
    return hres;
  }

--- a/dlls/ole32/itemmoniker.c
+++ b/dlls/ole32/itemmoniker.c
@@ -198,7 +198,7 @@ static ULONG WINAPI ItemMonikerImpl_Release(IMoniker* iface)
    ItemMonikerImpl *moniker = impl_from_IMoniker(iface);
    ULONG refcount = InterlockedDecrement(&moniker->ref);
-    TRACE("%p, refcount %u.\n", iface, refcount);
+    TRACE("%p, refcount %lu.\n", iface, refcount);
    if (!refcount)
    {
@@ -286,7 +286,7 @@ static HRESULT item_moniker_load_string_record(IStream *stream, WCHAR **ret)
        if (str_len % sizeof(WCHAR))
        {
-            WARN("Unexpected Unicode name length %d.\n", str_len);
+            WARN("Unexpected Unicode name length %ld.\n", str_len);
            hr = E_FAIL;
            goto end;
        }
@@ -491,16 +491,10 @@ static HRESULT WINAPI ItemMonikerImpl_BindToStorage(IMoniker *iface, IBindCtx *p
    return hr;
 }
-/******************************************************************************
+static HRESULT WINAPI ItemMonikerImpl_Reduce(IMoniker* iface, IBindCtx* pbc,
- *        ItemMoniker_Reduce
+        DWORD dwReduceHowFar, IMoniker** ppmkToLeft, IMoniker** ppmkReduced)
- ******************************************************************************/
-static HRESULT WINAPI ItemMonikerImpl_Reduce(IMoniker* iface,
-                                             IBindCtx* pbc,
-                                             DWORD dwReduceHowFar,
-                                             IMoniker** ppmkToLeft,
-                                             IMoniker** ppmkReduced)
 {
-    TRACE("(%p,%p,%d,%p,%p)\n",iface,pbc,dwReduceHowFar,ppmkToLeft,ppmkReduced);
+    TRACE("%p, %p, %ld, %p, %p.\n", iface, pbc, dwReduceHowFar, ppmkToLeft, ppmkReduced);
    if (ppmkReduced==NULL)
        return E_POINTER;
@@ -864,7 +858,7 @@ static HRESULT WINAPI ItemMonikerROTDataImpl_GetComparisonData(IROTData *iface, 
    int delim_len, i;
    WCHAR *ptrW;
-    TRACE("(%p, %p, %u, %p)\n", iface, buffer, max_len, data_len);
+    TRACE("%p, %p, %lu, %p.\n", iface, buffer, max_len, data_len);
    delim_len = This->itemDelimiter && This->itemDelimiter[0] ? lstrlenW(This->itemDelimiter) : 0;
    *data_len = sizeof(CLSID) + sizeof(WCHAR) + (delim_len + name_len) * sizeof(WCHAR);

--- a/dlls/ole32/memlockbytes.c
+++ b/dlls/ole32/memlockbytes.c
@@ -160,7 +160,7 @@ HRESULT WINAPI GetHGlobalFromILockBytes(ILockBytes* iface, HGLOBAL* phglobal)
  /* It is not our lockbytes implementation, so use a more generic way */
  hres = ILockBytes_Stat(iface,&stbuf,STATFLAG_NONAME);
  if (hres != S_OK) {
-     ERR("Cannot ILockBytes_Stat, %x\n",hres);
+     ERR("Cannot ILockBytes_Stat, %lx\n",hres);
     return hres;
  }
  TRACE("cbSize is %s\n", wine_dbgstr_longlong(stbuf.cbSize.QuadPart));
@@ -171,11 +171,11 @@ HRESULT WINAPI GetHGlobalFromILockBytes(ILockBytes* iface, HGLOBAL* phglobal)
  hres = ILockBytes_ReadAt(iface, start, GlobalLock(*phglobal), stbuf.cbSize.u.LowPart, &xread);
  GlobalUnlock(*phglobal);
  if (hres != S_OK) {
-    FIXME("%p->ReadAt failed with %x\n",iface,hres);
+    FIXME("%p->ReadAt failed with %lx\n",iface,hres);
    return hres;
  }
  if (stbuf.cbSize.u.LowPart != xread) {
-    FIXME("Read size is not requested size %d vs %d?\n",stbuf.cbSize.u.LowPart, xread);
+    FIXME("Read size is not requested size %ld vs %ld?\n",stbuf.cbSize.u.LowPart, xread);
  }
  return S_OK;
 }

--- a/dlls/ole32/moniker.c
+++ b/dlls/ole32/moniker.c
@@ -159,7 +159,7 @@ static HRESULT get_moniker_comparison_data(IMoniker *pMoniker, MonikerComparison
        IROTData_Release(pROTData);
        if (hr != S_OK)
        {
-            ERR("Failed to copy comparison data into buffer, hr = 0x%08x\n", hr);
+            ERR("Failed to copy comparison data into buffer, hr = %#lx\n", hr);
            HeapFree(GetProcessHeap(), 0, *moniker_data);
            return hr;
        }
@@ -218,7 +218,7 @@ static HRESULT reduce_moniker(IMoniker *pmk, IBindCtx *pbc, IMoniker **pmkReduce
    }
    hr = IMoniker_Reduce(pmk, pbc, MKRREDUCE_ALL, NULL, pmkReduced);
    if (FAILED(hr))
-        ERR("reducing moniker failed with error 0x%08x\n", hr);
+        ERR("reducing moniker failed with error %#lx.\n", hr);
    if (pbcNew) IBindCtx_Release(pbcNew);
    return hr;
 }
@@ -288,11 +288,11 @@ RunningObjectTableImpl_Register(IRunningObjectTable* iface, DWORD flags,
    IBindCtx *pbc;
    InterfaceData *moniker = NULL;
-    TRACE("%p, %#x, %p, %p, %p\n", This, flags, punkObject, pmkObjectName, pdwRegister);
+    TRACE("%p, %#lx, %p, %p, %p\n", iface, flags, punkObject, pmkObjectName, pdwRegister);
    if (flags & ~(ROTFLAGS_REGISTRATIONKEEPSALIVE|ROTFLAGS_ALLOWANYCLIENT))
    {
-        ERR("Invalid flags: 0x%08x\n", flags & ~(ROTFLAGS_REGISTRATIONKEEPSALIVE|ROTFLAGS_ALLOWANYCLIENT));
+        ERR("Invalid flags: %#lx\n", flags & ~(ROTFLAGS_REGISTRATIONKEEPSALIVE|ROTFLAGS_ALLOWANYCLIENT));
        return E_INVALIDARG;
    }
@@ -435,7 +435,7 @@ RunningObjectTableImpl_Revoke( IRunningObjectTable* iface, DWORD dwRegister)
    RunningObjectTableImpl *This = impl_from_IRunningObjectTable(iface);
    struct rot_entry *rot_entry;
-    TRACE("(%p,%d)\n",This,dwRegister);
+    TRACE("%p, %ld.\n", iface, dwRegister);
    EnterCriticalSection(&This->lock);
    LIST_FOR_EACH_ENTRY(rot_entry, &This->rot, struct rot_entry, entry)
@@ -568,7 +568,7 @@ RunningObjectTableImpl_GetObject( IRunningObjectTable* iface,
        }
    }
    else
-        WARN("Moniker unavailable, IrotGetObject returned 0x%08x\n", hr);
+        WARN("Moniker unavailable, IrotGetObject returned %#lx\n", hr);
    HeapFree(GetProcessHeap(), 0, moniker_data);
@@ -590,7 +590,7 @@ RunningObjectTableImpl_NoteChangeTime(IRunningObjectTable* iface,
    struct rot_entry *rot_entry;
    HRESULT hr = E_INVALIDARG;
-    TRACE("(%p,%d,%p)\n",This,dwRegister,pfiletime);
+    TRACE("%p, %ld, %p.\n", iface, dwRegister, pfiletime);
    EnterCriticalSection(&This->lock);
    LIST_FOR_EACH_ENTRY(rot_entry, &This->rot, struct rot_entry, entry)
@@ -608,7 +608,7 @@ RunningObjectTableImpl_NoteChangeTime(IRunningObjectTable* iface,
    LeaveCriticalSection(&This->lock);
 done:
-    TRACE("-- 0x08%x\n", hr);
+    TRACE("-- %#lx\n", hr);
    return hr;
 }
@@ -661,7 +661,7 @@ RunningObjectTableImpl_GetTimeOfLastChange(IRunningObjectTable* iface,
    HeapFree(GetProcessHeap(), 0, moniker_data);
-    TRACE("-- 0x%08x\n", hr);
+    TRACE("-- %#lx\n", hr);
    return hr;
 }
@@ -717,7 +717,7 @@ static RunningObjectTableImpl rot =
 */
 HRESULT WINAPI GetRunningObjectTable(DWORD reserved, IRunningObjectTable **ret)
 {
-    TRACE("%#x, %p\n", reserved, ret);
+    TRACE("%#lx, %p\n", reserved, ret);
    if (reserved!=0)
        return E_UNEXPECTED;
@@ -1048,7 +1048,7 @@ static HRESULT   WINAPI EnumMonikerImpl_Next(IEnumMoniker* iface, ULONG celt, IM
    EnumMonikerImpl *This = impl_from_IEnumMoniker(iface);
    HRESULT hr = S_OK;
-    TRACE("(%p) TabCurrentPos %d Tablastindx %d\n", This, This->pos, This->moniker_list->size);
+    TRACE("%p, %lu, %p, %p.\n", iface, celt, rgelt, pceltFetched);
    /* retrieve the requested number of moniker from the current position */
    for(i = 0; (This->pos < This->moniker_list->size) && (i < celt); i++)
@@ -1270,7 +1270,7 @@ static HRESULT WINAPI MonikerMarshal_GetUnmarshalClass(
 {
    MonikerMarshal *This = impl_from_IMarshal(iface);
-    TRACE("(%s, %p, %x, %p, %x, %p)\n", debugstr_guid(riid), pv,
+    TRACE("%s, %p, %lx, %p, %lx, %p.\n", debugstr_guid(riid), pv,
        dwDestContext, pvDestContext, mshlflags, pCid);
    return IMoniker_GetClassID(This->moniker, pCid);
@@ -1284,7 +1284,7 @@ static HRESULT WINAPI MonikerMarshal_GetMarshalSizeMax(
    HRESULT hr;
    ULARGE_INTEGER size;
-    TRACE("(%s, %p, %x, %p, %x, %p)\n", debugstr_guid(riid), pv,
+    TRACE("%s, %p, %lx, %p, %lx, %p.\n", debugstr_guid(riid), pv,
        dwDestContext, pvDestContext, mshlflags, pSize);
    hr = IMoniker_GetSizeMax(This->moniker, &size);
@@ -1299,7 +1299,7 @@ static HRESULT WINAPI MonikerMarshal_MarshalInterface(LPMARSHAL iface, IStream *
 {
    MonikerMarshal *This = impl_from_IMarshal(iface);
-    TRACE("(%p, %s, %p, %x, %p, %x)\n", pStm, debugstr_guid(riid), pv,
+    TRACE("%p, %s, %p, %lx, %p, %lx.\n", pStm, debugstr_guid(riid), pv,
        dwDestContext, pvDestContext, mshlflags);
    return IMoniker_Save(This->moniker, pStm, FALSE);

--- a/dlls/ole32/ole2.c
+++ b/dlls/ole32/ole2.c
@@ -253,9 +253,10 @@ void WINAPI DECLSPEC_HOTPATCH OleUninitialize(void)
 /******************************************************************************
 *		OleInitializeWOW	[OLE32.@]
 */
-HRESULT WINAPI OleInitializeWOW(DWORD x, DWORD y) {
+HRESULT WINAPI OleInitializeWOW(DWORD x, DWORD y)
-        FIXME("(0x%08x, 0x%08x),stub!\n",x, y);
+{
-        return 0;
+    FIXME("%#lx, %#lx stub!\n", x, y);
+    return 0;
 }
 /*************************************************************
@@ -664,7 +665,7 @@ HRESULT WINAPI OleRegGetUserType(REFCLSID clsid, DWORD form, LPOLESTR *usertype)
  HRESULT hres;
  LONG    ret;
-  TRACE("(%s, %u, %p)\n", debugstr_guid(clsid), form, usertype);
+  TRACE("%s, %lu, %p.\n", debugstr_guid(clsid), form, usertype);
  if (!usertype)
    return E_INVALIDARG;
@@ -735,7 +736,7 @@ HRESULT WINAPI DoDragDrop (
  HWND            hwndTrackWindow;
  MSG             msg;
-  TRACE("(%p, %p, %08x, %p)\n", pDataObject, pDropSource, dwOKEffect, pdwEffect);
+  TRACE("%p, %p, %#lx, %p.\n", pDataObject, pDropSource, dwOKEffect, pdwEffect);
  if (!pDataObject || !pDropSource || !pdwEffect)
      return E_INVALIDARG;
@@ -844,7 +845,7 @@ HRESULT WINAPI OleRegGetMiscStatus(
  LONG    result;
  HRESULT hr;
-  TRACE("(%s, %d, %p)\n", debugstr_guid(clsid), dwAspect, pdwStatus);
+  TRACE("%s, %ld, %p.\n", debugstr_guid(clsid), dwAspect, pdwStatus);
  if (!pdwStatus) return E_INVALIDARG;
@@ -934,7 +935,7 @@ static HRESULT WINAPI EnumOLEVERB_Next(
    EnumOLEVERB *This = impl_from_IEnumOLEVERB(iface);
    HRESULT hr = S_OK;
-    TRACE("(%d, %p, %p)\n", celt, rgelt, pceltFetched);
+    TRACE("%p, %lu, %p, %p.\n", iface, celt, rgelt, pceltFetched);
    if (pceltFetched)
        *pceltFetched = 0;
@@ -954,14 +955,14 @@ static HRESULT WINAPI EnumOLEVERB_Next(
        }
        else if (res != ERROR_SUCCESS)
        {
-            ERR("RegEnumKeyW failed with error %d\n", res);
+            ERR("RegEnumKeyW failed with error %ld\n", res);
            hr = REGDB_E_READREGDB;
            break;
        }
        res = RegQueryValueW(This->hkeyVerb, wszSubKey, NULL, &cbData);
        if (res != ERROR_SUCCESS)
        {
-            ERR("RegQueryValueW failed with error %d\n", res);
+            ERR("RegQueryValueW failed with error %ld\n", res);
            hr = REGDB_E_READREGDB;
            break;
        }
@@ -974,7 +975,7 @@ static HRESULT WINAPI EnumOLEVERB_Next(
        res = RegQueryValueW(This->hkeyVerb, wszSubKey, pwszOLEVERB, &cbData);
        if (res != ERROR_SUCCESS)
        {
-            ERR("RegQueryValueW failed with error %d\n", res);
+            ERR("RegQueryValueW failed with error %ld\n", res);
            hr = REGDB_E_READREGDB;
            CoTaskMemFree(pwszOLEVERB);
            break;
@@ -1020,7 +1021,7 @@ static HRESULT WINAPI EnumOLEVERB_Skip(
 {
    EnumOLEVERB *This = impl_from_IEnumOLEVERB(iface);
-    TRACE("(%d)\n", celt);
+    TRACE("%p, %lu.\n", iface, celt);
    This->index += celt;
    return S_OK;
@@ -1108,7 +1109,7 @@ HRESULT WINAPI OleRegEnumVerbs (REFCLSID clsid, LPENUMOLEVERB* ppenum)
        else if (res == REGDB_E_KEYMISSING)
            ERR("no Verbs key for class %s\n", debugstr_guid(clsid));
        else
-            ERR("failed to open Verbs key for CLSID %s with error %d\n",
+            ERR("failed to open Verbs key for CLSID %s with error %ld\n",
                debugstr_guid(clsid), res);
        return res;
    }
@@ -1117,7 +1118,7 @@ HRESULT WINAPI OleRegEnumVerbs (REFCLSID clsid, LPENUMOLEVERB* ppenum)
                          NULL, NULL, NULL, NULL, NULL, NULL);
    if (res != ERROR_SUCCESS)
    {
-        ERR("failed to get subkey count with error %d\n", GetLastError());
+        ERR("failed to get subkey count with error %ld\n", GetLastError());
        return REGDB_E_READREGDB;
    }
@@ -1602,7 +1603,7 @@ static LRESULT CALLBACK OLEMenu_CallWndProc(INT code, WPARAM wParam, LPARAM lPar
  OleMenuHookItem *pHookItem = NULL;
  WORD fuFlags;
-  TRACE("%i, %04lx, %08lx\n", code, wParam, lParam );
+  TRACE("%i, %#Ix, %#Ix.\n", code, wParam, lParam );
  /* Check if we're being asked to process the message */
  if ( HC_ACTION != code )
@@ -1707,7 +1708,7 @@ static LRESULT CALLBACK OLEMenu_GetMsgProc(INT code, WPARAM wParam, LPARAM lPara
  OleMenuHookItem *pHookItem = NULL;
  WORD wCode;
-  TRACE("%i, %04lx, %08lx\n", code, wParam, lParam );
+  TRACE("%i, %#Ix, %#Ix.\n", code, wParam, lParam );
  /* Check if we're being asked to process a  messages */
  if ( HC_ACTION != code )
@@ -1943,7 +1944,7 @@ BOOL WINAPI IsAccelerator(HACCEL hAccel, int cAccelEntries, LPMSG lpMsg, WORD* l
    }
    TRACE_(accel)("hAccel=%p, cAccelEntries=%d,"
-		"msg->hwnd=%p, msg->message=%04x, wParam=%08lx, lParam=%08lx\n",
+		"msg->hwnd=%p, msg->message=%04x, wParam=%#Ix, lParam=%#Ix\n",
 		hAccel, cAccelEntries,
 		lpMsg->hwnd, lpMsg->message, lpMsg->wParam, lpMsg->lParam);
    for(i = 0; i < cAccelEntries; i++)
@@ -1964,7 +1965,7 @@ BOOL WINAPI IsAccelerator(HACCEL hAccel, int cAccelEntries, LPMSG lpMsg, WORD* l
 	    if(lpAccelTbl[i].fVirt & FVIRTKEY)
 	    {
 		INT mask = 0;
-		TRACE_(accel)("found accel for virt_key %04lx (scan %04x)\n",
+		TRACE_(accel)("found accel for virt_key %Ix (scan %04x)\n",
 				lpMsg->wParam, HIWORD(lpMsg->lParam) & 0xff);
 		if(GetKeyState(VK_SHIFT) & 0x8000) mask |= FSHIFT;
 		if(GetKeyState(VK_CONTROL) & 0x8000) mask |= FCONTROL;
@@ -2463,7 +2464,7 @@ HRESULT WINAPI OleCreate(
    IUnknown * pUnk = NULL;
    IOleObject *pOleObject = NULL;
-    TRACE("(%s, %s, %d, %p, %p, %p, %p)\n", debugstr_guid(rclsid),
+    TRACE("%s, %s, %ld, %p, %p, %p, %p.\n", debugstr_guid(rclsid),
        debugstr_guid(riid), renderopt, pFormatEtc, pClientSite, pStg, ppvObj);
    hres = CoCreateInstance(rclsid, 0, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, riid, (LPVOID*)&pUnk);
@@ -2488,7 +2489,7 @@ HRESULT WINAPI OleCreate(
        {
            TRACE("trying to set stg %p\n", pStg);
            hres = IPersistStorage_InitNew(pPS, pStg);
-            TRACE("-- result 0x%08x\n", hres);
+            TRACE("-- result %#lx\n", hres);
            IPersistStorage_Release(pPS);
        }
    }
@@ -2497,7 +2498,7 @@ HRESULT WINAPI OleCreate(
    {
        TRACE("trying to set clientsite %p\n", pClientSite);
        hres = IOleObject_SetClientSite(pOleObject, pClientSite);
-        TRACE("-- result 0x%08x\n", hres);
+        TRACE("-- result %#lx\n", hres);
    }
    if (pOleObject)
@@ -2851,7 +2852,7 @@ HRESULT WINAPI OleCreateFromDataEx(IDataObject *data, REFIID iid, DWORD flags,
    HRESULT hr;
    UINT src_cf;
-    FIXME("(%p, %s, %08x, %08x, %d, %p, %p, %p, %p, %p, %p, %p): stub\n",
+    FIXME("%p, %s, %#lx, %#lx, %ld, %p, %p, %p, %p, %p, %p, %p: stub\n",
          data, debugstr_guid(iid), flags, renderopt, num_cache_fmts, adv_flags, cache_fmts,
          sink, conns, client_site, stg, obj);
@@ -2884,7 +2885,7 @@ HRESULT WINAPI OleCreateFromData(IDataObject *data, REFIID iid, DWORD renderopt,
 HRESULT WINAPI OleCreateLinkFromData(IDataObject *data, REFIID iid, DWORD renderopt, FORMATETC *fmt,
        IOleClientSite *client_site, IStorage *stg, void **obj)
 {
-    FIXME("%p,%s,%08x,%p,%p,%p,%p: semi-stub\n",
+    FIXME("%p, %s, %#lx, %p, %p, %p, %p: semi-stub\n",
          data, debugstr_guid(iid), renderopt, fmt, client_site, stg, obj);
    return OleCreateFromData(data, iid, renderopt, fmt, client_site, stg, obj);
 }
@@ -2904,8 +2905,7 @@ HRESULT WINAPI OleCreateStaticFromData(IDataObject *data, REFIID iid, DWORD rend
    STGMEDIUM stgmedium;
    LPOLESTR ole_typename;
-    TRACE("(%p, %s, 0x%08x, %p, %p, %p, %p)\n",
+    TRACE("%p, %s, %#lx, %p, %p, %p, %p.\n", data, debugstr_guid(iid), renderopt, fmt, client_site, stg, obj);
-          data, debugstr_guid(iid), renderopt, fmt, client_site, stg, obj);
    if (!obj || !stg)
        return E_INVALIDARG;
@@ -3007,11 +3007,11 @@ HRESULT WINAPI OleCreateFromFileEx(REFCLSID clsid, const OLECHAR *filename, REFI
    IOleCache *cache = NULL;
    ULONG i;
-    TRACE("cls %s, %s, iid %s, flags %d, render opts %d, num fmts %d, adv flags %p, fmts %p\n", debugstr_guid(clsid),
+    TRACE("cls %s, %s, iid %s, flags %ld, render opts %ld, num fmts %ld, adv flags %p, fmts %p\n", debugstr_guid(clsid),
          debugstr_w(filename), debugstr_guid(iid), flags, renderopt, num_fmts, adv_flags, fmts);
    TRACE("sink %p, conns %p, client site %p, storage %p, obj %p\n", sink, conns, client_site, stg, obj);
    for (i = 0; i < num_fmts; i++)
-        TRACE("\t%d: fmt %s adv flags %d\n", i, debugstr_formatetc(fmts + i), adv_flags[i]);
+        TRACE("\t%ld: fmt %s adv flags %ld\n", i, debugstr_formatetc(fmts + i), adv_flags[i]);
    hr = CreateFileMoniker( filename, &mon );
    if (FAILED(hr)) return hr;

--- a/dlls/ole32/ole2stubs.c
+++ b/dlls/ole32/ole2stubs.c
@@ -37,7 +37,7 @@ HRESULT WINAPI  OleCreateLinkToFile(LPCOLESTR lpszFileName, REFIID riid,
 	  		DWORD renderopt, LPFORMATETC lpFormatEtc,
 			LPOLECLIENTSITE pClientSite, LPSTORAGE pStg, LPVOID* ppvObj)
 {
-    FIXME("(%p,%p,%i,%p,%p,%p,%p), stub!\n",lpszFileName, riid, renderopt, lpFormatEtc, pClientSite, pStg, ppvObj);
+    FIXME("%p, %p, %ld, %p, %p, %p, %p stub!\n",lpszFileName, riid, renderopt, lpFormatEtc, pClientSite, pStg, ppvObj);
    return E_NOTIMPL;
 }
@@ -77,7 +77,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH OleRegEnumFormatEtc (
  DWORD    dwDirection,
  LPENUMFORMATETC* ppenumFormatetc)
 {
-    FIXME("(%p, %d, %p), stub!\n", clsid, dwDirection, ppenumFormatetc);
+    FIXME("%p, %ld, %p stub!\n", clsid, dwDirection, ppenumFormatetc);
    return E_NOTIMPL;
 }
--- a/dlls/ole32/oleobj.c
+++ b/dlls/ole32/oleobj.c
@@ -128,7 +128,7 @@ static HRESULT WINAPI EnumSTATDATA_Next(IEnumSTATDATA *iface, ULONG num, LPSTATD
    DWORD count = 0;
    HRESULT hr = S_OK;
-    TRACE("(%d, %p, %p)\n", num, data, fetched);
+    TRACE("%p, %lu, %p, %p.\n", iface, num, data, fetched);
    while(num--)
    {
@@ -153,7 +153,7 @@ static HRESULT WINAPI EnumSTATDATA_Skip(IEnumSTATDATA *iface, ULONG num)
 {
    EnumSTATDATA *This = impl_from_IEnumSTATDATA(iface);
-    TRACE("(%d)\n", num);
+    TRACE("%p, %lu.\n", iface, num);
    if(This->index + num >= This->num_of_elems)
    {
@@ -309,7 +309,7 @@ static ULONG WINAPI OleAdviseHolderImpl_AddRef(IOleAdviseHolder *iface)
  OleAdviseHolderImpl *This = impl_from_IOleAdviseHolder(iface);
  ULONG ref = InterlockedIncrement(&This->ref);
-  TRACE("(%p)->(ref=%d)\n", This, ref - 1);
+  TRACE("%p, refcount %lu.\n", iface, ref);
  return ref;
 }
@@ -320,9 +320,9 @@ static ULONG WINAPI OleAdviseHolderImpl_AddRef(IOleAdviseHolder *iface)
 static ULONG WINAPI OleAdviseHolderImpl_Release(IOleAdviseHolder *iface)
 {
  OleAdviseHolderImpl *This = impl_from_IOleAdviseHolder(iface);
-  ULONG ref;
+  ULONG ref = InterlockedDecrement(&This->ref);
-  TRACE("(%p)->(ref=%d)\n", This, This->ref);
-  ref = InterlockedDecrement(&This->ref);
+  TRACE("%p, refcount %lu.\n", iface, ref);
  if (ref == 0) OleAdviseHolderImpl_Destructor(This);
@@ -382,7 +382,7 @@ static HRESULT WINAPI OleAdviseHolderImpl_Unadvise(IOleAdviseHolder *iface,
  OleAdviseHolderImpl *This = impl_from_IOleAdviseHolder(iface);
  DWORD index;
-  TRACE("(%p)->(%u)\n", This, dwConnection);
+  TRACE("%p, %lu.\n", iface, dwConnection);
  /* The connection number is 1 more than the index, see OleAdviseHolder_Advise */
  index = dwConnection - 1;
@@ -609,8 +609,9 @@ static HRESULT WINAPI DataAdviseHolder_QueryInterface(IDataAdviseHolder *iface,
 static ULONG WINAPI DataAdviseHolder_AddRef(IDataAdviseHolder *iface)
 {
  DataAdviseHolder *This = impl_from_IDataAdviseHolder(iface);
-  TRACE("(%p) (ref=%d)\n", This, This->ref);
+  ULONG ref = InterlockedIncrement(&This->ref);
-  return InterlockedIncrement(&This->ref);
+  TRACE("%p, refcount %lu.\n", iface, ref);
+  return ref;
 }
 /************************************************************************
@@ -619,10 +620,10 @@ static ULONG WINAPI DataAdviseHolder_AddRef(IDataAdviseHolder *iface)
 static ULONG WINAPI DataAdviseHolder_Release(IDataAdviseHolder *iface)
 {
  DataAdviseHolder *This = impl_from_IDataAdviseHolder(iface);
-  ULONG ref;
+  ULONG ref = InterlockedDecrement(&This->ref);
-  TRACE("(%p) (ref=%d)\n", This, This->ref);
+  TRACE("%p, refcount %lu.\n", iface, ref);
-  ref = InterlockedDecrement(&This->ref);
  if (ref==0) DataAdviseHolder_Destructor(This);
  return ref;
@@ -641,8 +642,7 @@ static HRESULT WINAPI DataAdviseHolder_Advise(IDataAdviseHolder *iface,
  STATDATA new_conn;
  DataAdviseHolder *This = impl_from_IDataAdviseHolder(iface);
-  TRACE("(%p)->(%p, %p, %08x, %p, %p)\n", This, pDataObject, pFetc, advf,
+  TRACE("%p, %p, %p, %#lx, %p, %p.\n", iface, pDataObject, pFetc, advf, pAdvise, pdwConnection);
-	pAdvise, pdwConnection);
  if (pdwConnection==NULL)
    return E_POINTER;
@@ -709,7 +709,8 @@ static HRESULT WINAPI DataAdviseHolder_Unadvise(IDataAdviseHolder *iface,
 {
  DataAdviseHolder *This = impl_from_IDataAdviseHolder(iface);
  DWORD index;
-  TRACE("(%p)->(%u)\n", This, dwConnection);
+  TRACE("%p, %lu.\n", iface, dwConnection);
  /* The connection number is 1 more than the index, see DataAdviseHolder_Advise */
  index = dwConnection - 1;
@@ -756,7 +757,7 @@ static HRESULT WINAPI DataAdviseHolder_SendOnDataChange(IDataAdviseHolder *iface
    IEnumSTATDATA *pEnum;
    HRESULT hr;
-    TRACE("(%p)->(%p, %08x, %08x)\n", iface, data_obj, dwReserved, advf);
+    TRACE("%p, %p, %#lx, %#lx.\n", iface, data_obj, dwReserved, advf);
    hr = IDataAdviseHolder_EnumAdvise(iface, &pEnum);
    if (SUCCEEDED(hr))

--- a/dlls/ole32/pointermoniker.c
+++ b/dlls/ole32/pointermoniker.c
@@ -95,7 +95,7 @@ static ULONG WINAPI PointerMonikerImpl_AddRef(IMoniker *iface)
    PointerMonikerImpl *moniker = impl_from_IMoniker(iface);
    ULONG refcount = InterlockedIncrement(&moniker->refcount);
-    TRACE("%p, refcount %u.\n", iface, refcount);
+    TRACE("%p, refcount %lu.\n", iface, refcount);
    return refcount;
 }
@@ -105,7 +105,7 @@ static ULONG WINAPI PointerMonikerImpl_Release(IMoniker *iface)
    PointerMonikerImpl *moniker = impl_from_IMoniker(iface);
    ULONG refcount = InterlockedDecrement(&moniker->refcount);
-    TRACE("%p, refcount %u.\n", iface, refcount);
+    TRACE("%p, refcount %lu.\n", iface, refcount);
    if (!refcount)
    {
@@ -230,7 +230,7 @@ static HRESULT WINAPI
 PointerMonikerImpl_Reduce(IMoniker* iface, IBindCtx* pbc, DWORD dwReduceHowFar,
                       IMoniker** ppmkToLeft, IMoniker** ppmkReduced)
 {
-    TRACE("(%p,%p,%d,%p,%p)\n",iface,pbc,dwReduceHowFar,ppmkToLeft,ppmkReduced);
+    TRACE("%p, %p, %ld, %p, %p.\n", iface, pbc, dwReduceHowFar, ppmkToLeft, ppmkReduced);
    if (ppmkReduced==NULL)
        return E_POINTER;
@@ -509,7 +509,7 @@ static HRESULT WINAPI pointer_moniker_marshal_GetUnmarshalClass(IMarshal *iface,
 {
    PointerMonikerImpl *moniker = impl_from_IMarshal(iface);
-    TRACE("%p, %s, %p, %x, %p, %x, %p.\n", iface, debugstr_guid(riid), pv, dwDestContext, pvDestContext,
+    TRACE("%p, %s, %p, %lx, %p, %lx, %p.\n", iface, debugstr_guid(riid), pv, dwDestContext, pvDestContext,
            mshlflags, clsid);
    return IMoniker_GetClassID(&moniker->IMoniker_iface, clsid);
@@ -520,7 +520,7 @@ static HRESULT WINAPI pointer_moniker_marshal_GetMarshalSizeMax(IMarshal *iface,
 {
    PointerMonikerImpl *moniker = impl_from_IMarshal(iface);
-    TRACE("%p, %s, %p, %d, %p, %#x, %p.\n", iface, debugstr_guid(riid), pv, dwDestContext, pvDestContext,
+    TRACE("%p, %s, %p, %ld, %p, %#lx, %p.\n", iface, debugstr_guid(riid), pv, dwDestContext, pvDestContext,
            mshlflags, size);
    return CoGetMarshalSizeMax(size, &IID_IUnknown, moniker->pObject, dwDestContext, pvDestContext, mshlflags);
@@ -531,7 +531,7 @@ static HRESULT WINAPI pointer_moniker_marshal_MarshalInterface(IMarshal *iface, 
 {
    PointerMonikerImpl *moniker = impl_from_IMarshal(iface);
-    TRACE("%p, %s, %p, %x, %p, %x.\n", stream, debugstr_guid(riid), pv,
+    TRACE("%p, %s, %p, %lx, %p, %lx.\n", stream, debugstr_guid(riid), pv,
        dwDestContext, pvDestContext, mshlflags);
    return CoMarshalInterface(stream, &IID_IUnknown, moniker->pObject, dwDestContext,
@@ -550,7 +550,7 @@ static HRESULT WINAPI pointer_moniker_marshal_UnmarshalInterface(IMarshal *iface
    hr = CoUnmarshalInterface(stream, &IID_IUnknown, (void **)&object);
    if (FAILED(hr))
    {
-        ERR("Couldn't unmarshal moniker, hr = %#x.\n", hr);
+        ERR("Couldn't unmarshal moniker, hr = %#lx.\n", hr);
        return hr;
    }
@@ -570,7 +570,7 @@ static HRESULT WINAPI pointer_moniker_marshal_ReleaseMarshalData(IMarshal *iface
 static HRESULT WINAPI pointer_moniker_marshal_DisconnectObject(IMarshal *iface, DWORD reserved)
 {
-    TRACE("%p, %#x.\n", iface, reserved);
+    TRACE("%p, %#lx.\n", iface, reserved);
    return S_OK;
 }
@@ -699,7 +699,7 @@ static ULONG WINAPI ObjrefMonikerImpl_AddRef(IMoniker *iface)
    ObjrefMonikerImpl *moniker = objref_impl_from_IMoniker(iface);
    ULONG refcount = InterlockedIncrement(&moniker->refcount);
-    TRACE("%p, refcount %u\n", iface, refcount);
+    TRACE("%p, refcount %lu\n", iface, refcount);
    return refcount;
 }
@@ -709,7 +709,7 @@ static ULONG WINAPI ObjrefMonikerImpl_Release(IMoniker *iface)
    ObjrefMonikerImpl *moniker = objref_impl_from_IMoniker(iface);
    ULONG refcount = InterlockedDecrement(&moniker->refcount);
-    TRACE("%p, refcount %u\n", iface, refcount);
+    TRACE("%p, refcount %lu\n", iface, refcount);
    if (!refcount)
    {
@@ -772,7 +772,7 @@ static HRESULT WINAPI ObjrefMonikerImpl_BindToStorage(IMoniker *iface, IBindCtx 
 static HRESULT WINAPI ObjrefMonikerImpl_Reduce(IMoniker *iface, IBindCtx *pbc, DWORD howfar,
        IMoniker **left, IMoniker **reduced)
 {
-    FIXME("(%p,%p,%d,%p,%p): stub\n", iface, pbc, howfar, left, reduced);
+    FIXME("%p, %p, %ld, %p, %p: stub\n", iface, pbc, howfar, left, reduced);
    return E_NOTIMPL;
 }
@@ -930,7 +930,7 @@ static HRESULT WINAPI objref_moniker_marshal_GetUnmarshalClass(IMarshal *iface, 
 {
    ObjrefMonikerImpl *moniker = objref_impl_from_IMarshal(iface);
-    TRACE("(%p,%s,%p,%08x,%p,%x,%p)\n", iface, debugstr_guid(riid), pv, dwDestContext, pvDestContext,
+    TRACE("%p, %s, %p, %#lx, %p, %#lx, %p.\n", iface, debugstr_guid(riid), pv, dwDestContext, pvDestContext,
            mshlflags, clsid);
    return IMoniker_GetClassID(&moniker->IMoniker_iface, clsid);
@@ -941,7 +941,7 @@ static HRESULT WINAPI objref_moniker_marshal_GetMarshalSizeMax(IMarshal *iface, 
 {
    ObjrefMonikerImpl *moniker = objref_impl_from_IMarshal(iface);
-    TRACE("(%p,%s,%p,%08x,%p,%08x,%p)\n", iface, debugstr_guid(riid), pv, dwDestContext, pvDestContext,
+    TRACE("%p, %s, %p, %#lx, %p, %#lx, %p.\n", iface, debugstr_guid(riid), pv, dwDestContext, pvDestContext,
            mshlflags, size);
    return CoGetMarshalSizeMax(size, &IID_IUnknown, moniker->pObject, dwDestContext, pvDestContext, mshlflags);
@@ -952,7 +952,7 @@ static HRESULT WINAPI objref_moniker_marshal_MarshalInterface(IMarshal *iface, I
 {
    ObjrefMonikerImpl *moniker = objref_impl_from_IMarshal(iface);
-    TRACE("(%p,%s,%p,%08x,%p,%08x)\n", stream, debugstr_guid(riid), pv, dwDestContext, pvDestContext, mshlflags);
+    TRACE("%p, %s, %p, %#lx, %p, %#lx\n", stream, debugstr_guid(riid), pv, dwDestContext, pvDestContext, mshlflags);
    return CoMarshalInterface(stream, &IID_IUnknown, moniker->pObject, dwDestContext, pvDestContext, mshlflags);
 }
@@ -969,7 +969,7 @@ static HRESULT WINAPI objref_moniker_marshal_UnmarshalInterface(IMarshal *iface,
    hr = CoUnmarshalInterface(stream, &IID_IUnknown, (void **)&object);
    if (FAILED(hr))
    {
-        ERR("Couldn't unmarshal moniker, hr = %#x.\n", hr);
+        ERR("Couldn't unmarshal moniker, hr = %#lx.\n", hr);
        return hr;
    }
@@ -988,7 +988,7 @@ static HRESULT WINAPI objref_moniker_marshal_ReleaseMarshalData(IMarshal *iface,
 static HRESULT WINAPI objref_moniker_marshal_DisconnectObject(IMarshal *iface, DWORD reserved)
 {
-    TRACE("(%p,%08x)\n", iface, reserved);
+    TRACE("%p, %#lx.\n", iface, reserved);
    return S_OK;
 }

--- a/dlls/ole32/stg_prop.c
+++ b/dlls/ole32/stg_prop.c
--- a/dlls/ole32/stg_stream.c
+++ b/dlls/ole32/stg_stream.c
@@ -136,8 +136,7 @@ static HRESULT WINAPI StgStreamImpl_Read(
  ULONG bytesReadBuffer;
  HRESULT res;
-  TRACE("(%p, %p, %d, %p)\n",
+  TRACE("%p, %p, %lu, %p.\n", iface, pv, cb, pcbRead);
-	iface, pv, cb, pcbRead);
  if (!This->parentStorage)
  {
@@ -167,7 +166,7 @@ static HRESULT WINAPI StgStreamImpl_Read(
    This->currentPosition.QuadPart += *pcbRead;
  }
-  TRACE("<-- %08x\n", res);
+  TRACE("<-- %#lx\n", res);
  return res;
 }
@@ -192,8 +191,7 @@ static HRESULT WINAPI StgStreamImpl_Write(
  ULONG bytesWritten = 0;
  HRESULT res;
-  TRACE("(%p, %p, %d, %p)\n",
+  TRACE("%p, %p, %lu, %p.\n", iface, pv, cb, pcbWritten);
-	iface, pv, cb, pcbWritten);
  /*
   * Do we have permission to write to this stream?
@@ -204,7 +202,7 @@ static HRESULT WINAPI StgStreamImpl_Write(
  case STGM_READWRITE:
      break;
  default:
-      WARN("access denied by flags: 0x%x\n", STGM_ACCESS_MODE(This->grfMode));
+      WARN("access denied by flags: %#lx\n", STGM_ACCESS_MODE(This->grfMode));
      return STG_E_ACCESSDENIED;
  }
@@ -250,7 +248,7 @@ static HRESULT WINAPI StgStreamImpl_Write(
  if (SUCCEEDED(res))
    res = StorageBaseImpl_Flush(This->parentStorage);
-  TRACE("<-- %08x, written %u\n", res, *pcbWritten);
+  TRACE("<-- %#lx, written %lu\n", res, *pcbWritten);
  return res;
 }
@@ -274,8 +272,7 @@ static HRESULT WINAPI StgStreamImpl_Seek(
  DirEntry currentEntry;
  HRESULT hr;
-  TRACE("(%p, %d, %d, %p)\n",
+  TRACE("%p, %ld, %ld, %p.\n", iface, dlibMove.u.LowPart, dwOrigin, plibNewPosition);
-	iface, dlibMove.u.LowPart, dwOrigin, plibNewPosition);
  /*
   * fail if the stream has no parent (as does windows)
@@ -316,7 +313,7 @@ static HRESULT WINAPI StgStreamImpl_Seek(
      *plibNewPosition = currentEntry.size;
      break;
    default:
-      WARN("invalid dwOrigin %d\n", dwOrigin);
+      WARN("invalid dwOrigin %ld\n", dwOrigin);
      return STG_E_INVALIDFUNCTION;
  }
@@ -345,7 +342,7 @@ static HRESULT WINAPI StgStreamImpl_SetSize(
  HRESULT      hr;
-  TRACE("(%p, %d)\n", iface, libNewSize.u.LowPart);
+  TRACE("%p, %ld.\n", iface, libNewSize.u.LowPart);
  if(!This->parentStorage)
  {
@@ -358,7 +355,7 @@ static HRESULT WINAPI StgStreamImpl_SetSize(
   */
  if (libNewSize.u.HighPart != 0)
  {
-    WARN("invalid value for libNewSize.u.HighPart %d\n", libNewSize.u.HighPart);
+    WARN("invalid value for libNewSize.u.HighPart %ld\n", libNewSize.u.HighPart);
    return STG_E_INVALIDFUNCTION;
  }
@@ -400,8 +397,7 @@ static HRESULT WINAPI StgStreamImpl_CopyTo(
  ULARGE_INTEGER totalBytesRead;
  ULARGE_INTEGER totalBytesWritten;
-  TRACE("(%p, %p, %d, %p, %p)\n",
+  TRACE("%p, %p, %ld, %p, %p.\n", iface, pstm, cb.u.LowPart, pcbRead, pcbWritten);
-	iface, pstm, cb.u.LowPart, pcbRead, pcbWritten);
  /*
   * Sanity check
@@ -547,7 +543,7 @@ static HRESULT WINAPI StgStreamImpl_Stat(
  DirEntry     currentEntry;
  HRESULT      hr;
-  TRACE("%p %p %d\n", This, pstatstg, grfStatFlag);
+  TRACE("%p, %p, %#lx.\n", This, pstatstg, grfStatFlag);
  /*
   * if stream has no parent, return STG_E_REVERTED

--- a/dlls/ole32/storage32.c
+++ b/dlls/ole32/storage32.c
--- a/dlls/ole32/usrmarshal.c
+++ b/dlls/ole32/usrmarshal.c