[PATCH 01/23] dlls/iccvid: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech

---
 dlls/iccvid/Makefile.in |    1 -
 dlls/iccvid/iccvid.c    |   16 ++++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/dlls/iccvid/Makefile.in b/dlls/iccvid/Makefile.in
index 835935c1162..77254521fae 100644
--- a/dlls/iccvid/Makefile.in
+++ b/dlls/iccvid/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = iccvid.dll
 IMPORTS   = user32

diff --git a/dlls/iccvid/iccvid.c b/dlls/iccvid/iccvid.c
index 67967a0fb38..4dc418c590b 100644
--- a/dlls/iccvid/iccvid.c
+++ b/dlls/iccvid/iccvid.c
@@ -743,8 +743,8 @@ static void ICCVID_dump_BITMAPINFO(const BITMAPINFO * bmi)
     TRACE(
         "planes = %d\n"
         "bpp    = %d\n"
-        "height = %d\n"
-        "width  = %d\n"
+        "height = %ld\n"
+        "width  = %ld\n"
         "compr  = %s\n",
         bmi->bmiHeader.biPlanes,
         bmi->bmiHeader.biBitCount,
@@ -759,7 +759,7 @@ static inline int ICCVID_CheckMask(RGBQUAD bmiColors[3], COLORREF redMask, COLOR
     COLORREF realBlueMask = MAKECOLOUR32(bmiColors[1].rgbRed, bmiColors[1].rgbGreen, bmiColors[1].rgbBlue);
     COLORREF realGreenMask = MAKECOLOUR32(bmiColors[2].rgbRed, bmiColors[2].rgbGreen, bmiColors[2].rgbBlue);

-    TRACE("\nbmiColors[0] = 0x%08x\nbmiColors[1] = 0x%08x\nbmiColors[2] = 0x%08x\n",
+    TRACE("\nbmiColors[0] = 0x%08lx\nbmiColors[1] = 0x%08lx\nbmiColors[2] = 0x%08lx\n",
         realRedMask, realBlueMask, realGreenMask);

if ((realRedMask == redMask) &&
@@ -888,7 +888,7 @@ static LRESULT ICCVID_Decompress( ICCVID_Info *info, ICDECOMPRESS *icd, DWORD si
     LONG width, height;
     BOOL inverted;

-    TRACE("ICM_DECOMPRESS %p %p %d\n", info, icd, size);
+    TRACE("ICM_DECOMPRESS %p %p %ld\n", info, icd, size);

if( (info==NULL) || (info->dwMagic!=ICCVID_MAGIC) )
         return ICERR_BADPARAM;
@@ -913,7 +913,7 @@ static LRESULT ICCVID_DecompressEx( ICCVID_Info *info, ICDECOMPRESSEX *icd, DWOR
     LONG width, height;
     BOOL inverted;

-    TRACE("ICM_DECOMPRESSEX %p %p %d\n", info, icd, size);
+    TRACE("ICM_DECOMPRESSEX %p %p %ld\n", info, icd, size);

if( (info==NULL) || (info->dwMagic!=ICCVID_MAGIC) )
         return ICERR_BADPARAM;
@@ -979,7 +979,7 @@ LRESULT WINAPI ICCVID_DriverProc( DWORD_PTR dwDriverId, HDRVR hdrvr, UINT msg,
 {
     ICCVID_Info *info = (ICCVID_Info *) dwDriverId;

-    TRACE("%ld %p %d %ld %ld\n", dwDriverId, hdrvr, msg, lParam1, lParam2);
+    TRACE("%Id %p %d %Id %Id\n", dwDriverId, hdrvr, msg, lParam1, lParam2);

switch( msg )
     {
@@ -1043,14 +1043,14 @@ LRESULT WINAPI ICCVID_DriverProc( DWORD_PTR dwDriverId, HDRVR hdrvr, UINT msg,
         return ICERR_UNSUPPORTED;

default:
-        FIXME("Unknown message: %04x %ld %ld\n", msg, lParam1, lParam2);
+        FIXME("Unknown message: %04x %Id %Id\n", msg, lParam1, lParam2);
     }
     return ICERR_UNSUPPORTED;
 }

BOOL WINAPI DllMain(HINSTANCE hModule, DWORD dwReason, LPVOID lpReserved)
 {
-    TRACE("(%p,%d,%p)\n", hModule, dwReason, lpReserved);
+    TRACE("(%p,%ld,%p)\n", hModule, dwReason, lpReserved);

switch (dwReason)
     {

[PATCH 02/23] dlls/ieframe: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech

---
 dlls/ieframe/Makefile.in     |    1 -
 dlls/ieframe/classinfo.c     |    4 +-
 dlls/ieframe/client.c        |   22 ++++++------
 dlls/ieframe/dochost.c       |   52 ++++++++++++++-------------
 dlls/ieframe/events.c        |   10 +++--
 dlls/ieframe/ie.c            |   24 ++++++-------
 dlls/ieframe/ieframe_main.c  |    8 ++--
 dlls/ieframe/iehtmlwnd.c     |   22 ++++++------
 dlls/ieframe/iexplore.c      |   10 +++--
 dlls/ieframe/intshcut.c      |   20 +++++------
 dlls/ieframe/navigate.c      |   80 +++++++++++++++++++++---------------------
 dlls/ieframe/oleobject.c     |   44 ++++++++++++-----------
 dlls/ieframe/persist.c       |    4 +-
 dlls/ieframe/shellbrowser.c  |   24 ++++++-------
 dlls/ieframe/shelluihelper.c |   10 +++--
 dlls/ieframe/urlhist.c       |    8 ++--
 dlls/ieframe/view.c          |   12 +++---
 dlls/ieframe/webbrowser.c    |   18 +++++----
 18 files changed, 186 insertions(+), 187 deletions(-)

diff --git a/dlls/ieframe/Makefile.in b/dlls/ieframe/Makefile.in
index caf8a5d84c0..4b1005da8cf 100644
--- a/dlls/ieframe/Makefile.in
+++ b/dlls/ieframe/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = ieframe.dll
 IMPORTLIB = ieframe
 IMPORTS   = uuid urlmon shell32 comctl32 shlwapi oleaut32 ole32 user32 gdi32 advapi32
diff --git a/dlls/ieframe/classinfo.c b/dlls/ieframe/classinfo.c
index c6698af890f..254cba3ce39 100644
--- a/dlls/ieframe/classinfo.c
+++ b/dlls/ieframe/classinfo.c
@@ -72,13 +72,13 @@ static HRESULT WINAPI ProvideClassInfo_GetGUID(IProvideClassInfo2 *iface,
 {
     WebBrowser *This = impl_from_IProvideClassInfo2(iface);

-    TRACE("(%p)->(%d %p)\n", This, dwGuidKind, pGUID);
+    TRACE("(%p)->(%ld %p)\n", This, dwGuidKind, pGUID);

if(!pGUID)
         return E_POINTER;

if (dwGuidKind != GUIDKIND_DEFAULT_SOURCE_DISP_IID) {
-        WARN("Wrong GUID type: %d\n", dwGuidKind);
+        WARN("Wrong GUID type: %ld\n", dwGuidKind);
         *pGUID = IID_NULL;
         return E_FAIL;
     }
diff --git a/dlls/ieframe/client.c b/dlls/ieframe/client.c
index 4846e28a050..cbdcf7a70d3 100644
--- a/dlls/ieframe/client.c
+++ b/dlls/ieframe/client.c
@@ -108,7 +108,7 @@ static HRESULT WINAPI ClientSite_GetMoniker(IOleClientSite *iface, DWORD dwAssig
                                             DWORD dwWhichMoniker, IMoniker **ppmk)
 {
     DocHost *This = impl_from_IOleClientSite(iface);
-    FIXME("(%p)->(%d %d %p)\n", This, dwAssign, dwWhichMoniker, ppmk);
+    FIXME("(%p)->(%ld %ld %p)\n", This, dwAssign, dwWhichMoniker, ppmk);
     return E_NOTIMPL;
 }

@@ -246,7 +246,7 @@ static HRESULT WINAPI InPlaceSite_GetWindowContext(IOleInPlaceSiteEx *iface,
 static HRESULT WINAPI InPlaceSite_Scroll(IOleInPlaceSiteEx *iface, SIZE scrollExtent)
 {
     DocHost *This = impl_from_IOleInPlaceSiteEx(iface);
-    FIXME("(%p)->({%d %d})\n", This, scrollExtent.cx, scrollExtent.cy);
+    FIXME("(%p)->({%ld %ld})\n", This, scrollExtent.cx, scrollExtent.cy);
     return E_NOTIMPL;
 }

@@ -294,13 +294,13 @@ static HRESULT WINAPI InPlaceSite_OnInPlaceActivateEx(IOleInPlaceSiteEx *iface,
 {
     DocHost *This = impl_from_IOleInPlaceSiteEx(iface);

-    TRACE("(%p)->(%p, %x)\n", This, pfNoRedraw, dwFlags);
+    TRACE("(%p)->(%p, %lx)\n", This, pfNoRedraw, dwFlags);

/* FIXME: Avoid redraw, when possible */
     *pfNoRedraw = FALSE;

if (dwFlags) {
-        FIXME("dwFlags not supported (%x)\n", dwFlags);
+        FIXME("dwFlags not supported (%lx)\n", dwFlags);
     }

/* Nothing to do here */
@@ -458,7 +458,7 @@ static HRESULT WINAPI ControlSite_TransformCoords(IOleControlSite *iface, POINTL
                                                   POINTF *pPtfContainer, DWORD dwFlags)
 {
     DocHost *This = impl_from_IOleControlSite(iface);
-    FIXME("(%p)->(%p, %p, %08x)\n", This, pPtlHimetric, pPtfContainer, dwFlags);
+    FIXME("(%p)->(%p, %p, %08lx)\n", This, pPtlHimetric, pPtfContainer, dwFlags);
     return E_NOTIMPL;
 }

@@ -471,7 +471,7 @@ static HRESULT WINAPI ControlSite_TranslateAccelerator(IOleControlSite *iface, M
     IOleControlSite *controlsite;
     HRESULT hr;

-    TRACE("(%p)->(%p, %08x)\n", This, pMsg, grfModifiers);
+    TRACE("(%p)->(%p, %08lx)\n", This, pMsg, grfModifiers);

hr = IWebBrowser2_QueryInterface(This->wb, &IID_IOleObject, (void**)&wb_obj);
     if(SUCCEEDED(hr)) {
@@ -557,7 +557,7 @@ static HRESULT WINAPI ClDispatch_GetTypeInfo(IDispatch *iface, UINT iTInfo, LCID
 {
     DocHost *This = impl_from_IDispatch(iface);

-    TRACE("(%p)->(%u %d %p)\n", This, iTInfo, lcid, ppTInfo);
+    TRACE("(%p)->(%u %ld %p)\n", This, iTInfo, lcid, ppTInfo);

return E_NOTIMPL;
 }
@@ -567,7 +567,7 @@ static HRESULT WINAPI ClDispatch_GetIDsOfNames(IDispatch *iface, REFIID riid, LP
 {
     DocHost *This = impl_from_IDispatch(iface);

-    TRACE("(%p)->(%s %p %u %d %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
+    TRACE("(%p)->(%s %p %u %ld %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
           lcid, rgDispId);

return E_NOTIMPL;
@@ -588,7 +588,7 @@ static const char *debugstr_dispid(DISPID dispid)
     }
 #undef CASE_DISPID

-    sprintf(buf, "%d", dispid);
+    sprintf(buf, "%ld", dispid);
     return buf;
 }

@@ -598,7 +598,7 @@ static HRESULT WINAPI ClDispatch_Invoke(IDispatch *iface, DISPID dispIdMember, R
 {
     DocHost *This = impl_from_IDispatch(iface);

-    TRACE("(%p)->(%s %s %d %04x %p %p %p %p)\n", This, debugstr_dispid(dispIdMember),
+    TRACE("(%p)->(%s %s %ld %04x %p %p %p %p)\n", This, debugstr_dispid(dispIdMember),
           debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);

switch(dispIdMember) {
@@ -620,7 +620,7 @@ static HRESULT WINAPI ClDispatch_Invoke(IDispatch *iface, DISPID dispIdMember, R
         return S_OK;
     }

-    FIXME("unhandled dispid %d\n", dispIdMember);
+    FIXME("unhandled dispid %ld\n", dispIdMember);
     return E_NOTIMPL;
 }

diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c
index 1ba31c552ed..7717f786d52 100644
--- a/dlls/ieframe/dochost.c
+++ b/dlls/ieframe/dochost.c
@@ -85,7 +85,7 @@ void on_commandstate_change(DocHost *doc_host, LONG command, BOOL enable)
     DISPPARAMS dispparams;
     VARIANTARG params[2];

-    TRACE("command=%d enable=%d\n", command, enable);
+    TRACE("command=%ld enable=%d\n", command, enable);

dispparams.cArgs = 2;
     dispparams.cNamedArgs = 0;
@@ -131,9 +131,9 @@ static void notif_complete(DocHost *This, DISPID dispid)
     V_VT(&url) = VT_BSTR;
     V_BSTR(&url) = SysAllocString(This->url);

-    TRACE("%d >>>\n", dispid);
+    TRACE("%ld >>>\n", dispid);
     call_sink(This->cps.wbe2, dispid, &dispparams);
-    TRACE("%d <<<\n", dispid);
+    TRACE("%ld <<<\n", dispid);

SysFreeString(V_BSTR(&url));
 }
@@ -164,7 +164,7 @@ static void object_available(DocHost *This)

hres = IUnknown_QueryInterface(This->document, &IID_IOleObject, (void**)&ole_object);
         if(FAILED(hres)) {
-            FIXME("Could not get IOleObject iface: %08x\n", hres);
+            FIXME("Could not get IOleObject iface: %08lx\n", hres);
             return;
         }

@@ -172,7 +172,7 @@ static void object_available(DocHost *This)
         hres = IOleObject_DoVerb(ole_object, OLEIVERB_SHOW, NULL, &This->IOleClientSite_iface, -1, This->hwnd, &rect);
         IOleObject_Release(ole_object);
         if(FAILED(hres))
-            FIXME("DoVerb failed: %08x\n", hres);
+            FIXME("DoVerb failed: %08lx\n", hres);
     }
 }

@@ -192,7 +192,7 @@ static HRESULT get_doc_ready_state(DocHost *This, READYSTATE *ret)
             &dp, &var, &ei, NULL);
     IDispatch_Release(disp);
     if(FAILED(hres)) {
-        WARN("Invoke(DISPID_READYSTATE failed: %08x\n", hres);
+        WARN("Invoke(DISPID_READYSTATE failed: %08lx\n", hres);
         return hres;
     }

@@ -322,11 +322,11 @@ HRESULT dochost_object_available(DocHost *This, IUnknown *doc)

hres = IOleObject_SetClientSite(oleobj, &This->IOleClientSite_iface);
         if(FAILED(hres))
-            FIXME("SetClientSite failed: %08x\n", hres);
+            FIXME("SetClientSite failed: %08lx\n", hres);

IOleObject_Release(oleobj);
     }else {
-        FIXME("Could not get IOleObject iface: %08x\n", hres);
+        FIXME("Could not get IOleObject iface: %08lx\n", hres);
     }

/* FIXME: Call SetAdvise */
@@ -353,7 +353,7 @@ static LRESULT resize_document(DocHost *This, LONG width, LONG height)
 {
     RECT rect = {0, 0, width, height};

-    TRACE("(%p)->(%d %d)\n", This, width, height);
+    TRACE("(%p)->(%ld %ld)\n", This, width, height);

if(This->view)
         IOleDocumentView_SetRect(This->view, &rect);
@@ -685,10 +685,10 @@ static HRESULT WINAPI ClOleCommandTarget_QueryStatus(IOleCommandTarget *iface,
     DocHost *This = impl_from_IOleCommandTarget(iface);
     ULONG i;

-    TRACE("(%p)->(%s %u %p %p)\n", This, debugstr_guid(pguidCmdGroup), cCmds, prgCmds,
+    TRACE("(%p)->(%s %lu %p %p)\n", This, debugstr_guid(pguidCmdGroup), cCmds, prgCmds,
           pCmdText);
     for(i=0; prgCmds && i < cCmds; i++)
-        TRACE("unsupported command %u (%x)\n", prgCmds[i].cmdID, prgCmds[i].cmdf);
+        TRACE("unsupported command %lu (%lx)\n", prgCmds[i].cmdID, prgCmds[i].cmdf);

return E_NOTIMPL;
 }
@@ -699,7 +699,7 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface,
 {
     DocHost *This = impl_from_IOleCommandTarget(iface);

-    TRACE("(%p)->(%s %d %d %s %s)\n", This, debugstr_guid(pguidCmdGroup), nCmdID, nCmdexecopt,
+    TRACE("(%p)->(%s %ld %ld %s %s)\n", This, debugstr_guid(pguidCmdGroup), nCmdID, nCmdexecopt,
             debugstr_variant(pvaIn), debugstr_variant(pvaOut));

if(!pguidCmdGroup) {
@@ -720,7 +720,7 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface,
             notify_download_state(This, V_I4(pvaIn));
             return S_OK;
         default:
-            TRACE("Unimplemented cmdid %d\n", nCmdID);
+            TRACE("Unimplemented cmdid %ld\n", nCmdID);
             return E_NOTIMPL;
         }
     }
@@ -772,7 +772,7 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface,
         }

default:
-            TRACE("unsupported command %d of CGID_DocHostCmdPriv\n", nCmdID);
+            TRACE("unsupported command %ld of CGID_DocHostCmdPriv\n", nCmdID);
             return E_NOTIMPL;
         }
     }
@@ -785,7 +785,7 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface,
             return S_OK;

default:
-            TRACE("Unimplemented cmdid %d of CGID_Explorer\n", nCmdID);
+            TRACE("Unimplemented cmdid %ld of CGID_Explorer\n", nCmdID);
             return E_NOTIMPL;
         }
     }
@@ -793,7 +793,7 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface,
     if(IsEqualGUID(pguidCmdGroup, &CGID_ShellDocView)) {
         switch(nCmdID) {
         default:
-            TRACE("Unimplemented cmdid %d of CGID_ShellDocView\n", nCmdID);
+            TRACE("Unimplemented cmdid %ld of CGID_ShellDocView\n", nCmdID);
             return E_NOTIMPL;
         }
     }
@@ -804,7 +804,7 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface,
         return IOleCommandTarget_Exec(This->olecmd, pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut);
     }

-    TRACE("Unimplemented cmdid %d of group %s\n", nCmdID, debugstr_guid(pguidCmdGroup));
+    TRACE("Unimplemented cmdid %ld of group %s\n", nCmdID, debugstr_guid(pguidCmdGroup));
     return E_NOTIMPL;
 }

@@ -846,7 +846,7 @@ static HRESULT WINAPI DocHostUIHandler_ShowContextMenu(IDocHostUIHandler2 *iface
     DocHost *This = impl_from_IDocHostUIHandler2(iface);
     HRESULT hres;

-    TRACE("(%p)->(%d %p %p %p)\n", This, dwID, ppt, pcmdtReserved, pdispReserved);
+    TRACE("(%p)->(%ld %p %p %p)\n", This, dwID, ppt, pcmdtReserved, pdispReserved);

if(This->hostui) {
         hres = IDocHostUIHandler_ShowContextMenu(This->hostui, dwID, ppt, pcmdtReserved,
@@ -884,7 +884,7 @@ static HRESULT WINAPI DocHostUIHandler_ShowUI(IDocHostUIHandler2 *iface, DWORD d
         IOleInPlaceFrame *pFrame, IOleInPlaceUIWindow *pDoc)
 {
     DocHost *This = impl_from_IDocHostUIHandler2(iface);
-    FIXME("(%p)->(%d %p %p %p %p)\n", This, dwID, pActiveObject, pCommandTarget,
+    FIXME("(%p)->(%ld %p %p %p %p)\n", This, dwID, pActiveObject, pCommandTarget,
           pFrame, pDoc);
     return E_NOTIMPL;
 }
@@ -945,7 +945,7 @@ static HRESULT WINAPI DocHostUIHandler_TranslateAccelerator(IDocHostUIHandler2 *
 {
     DocHost *This = impl_from_IDocHostUIHandler2(iface);
     HRESULT hr = S_FALSE;
-    TRACE("(%p)->(%p %p %d)\n", This, lpMsg, pguidCmdGroup, nCmdID);
+    TRACE("(%p)->(%p %p %ld)\n", This, lpMsg, pguidCmdGroup, nCmdID);

if(This->hostui)
         hr = IDocHostUIHandler_TranslateAccelerator(This->hostui, lpMsg, pguidCmdGroup, nCmdID);
@@ -958,7 +958,7 @@ static HRESULT WINAPI DocHostUIHandler_GetOptionKeyPath(IDocHostUIHandler2 *ifac
 {
     DocHost *This = impl_from_IDocHostUIHandler2(iface);

-    TRACE("(%p)->(%p %d)\n", This, pchKey, dw);
+    TRACE("(%p)->(%p %ld)\n", This, pchKey, dw);

if(This->hostui)
         return IDocHostUIHandler_GetOptionKeyPath(This->hostui, pchKey, dw);
@@ -1002,7 +1002,7 @@ static HRESULT WINAPI DocHostUIHandler_TranslateUrl(IDocHostUIHandler2 *iface,
 {
     DocHost *This = impl_from_IDocHostUIHandler2(iface);

-    TRACE("(%p)->(%d %s %p)\n", This, dwTranslate, debugstr_w(pchURLIn), ppchURLOut);
+    TRACE("(%p)->(%ld %s %p)\n", This, dwTranslate, debugstr_w(pchURLIn), ppchURLOut);

if(This->hostui)
         return IDocHostUIHandler_TranslateUrl(This->hostui, dwTranslate,
@@ -1026,7 +1026,7 @@ static HRESULT WINAPI DocHostUIHandler_GetOverrideKeyPath(IDocHostUIHandler2 *if
     IDocHostUIHandler2 *handler;
     HRESULT hres;

-    TRACE("(%p)->(%p %d)\n", This, pchKey, dw);
+    TRACE("(%p)->(%p %ld)\n", This, pchKey, dw);

if(!This->hostui)
         return S_OK;
@@ -1092,7 +1092,7 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D
 {
     DocHost *This = impl_from_IPropertyNotifySink(iface);

-    TRACE("(%p)->(%d)\n", This, dispID);
+    TRACE("(%p)->(%ld)\n", This, dispID);

switch(dispID) {
     case DISPID_READYSTATE: {
@@ -1110,7 +1110,7 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D
         break;
     }
     default:
-        FIXME("unimplemented dispid %d\n", dispID);
+        FIXME("unimplemented dispid %ld\n", dispID);
         return E_NOTIMPL;
     }

@@ -1120,7 +1120,7 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D
 static HRESULT WINAPI PropertyNotifySink_OnRequestEdit(IPropertyNotifySink *iface, DISPID dispID)
 {
     DocHost *This = impl_from_IPropertyNotifySink(iface);
-    FIXME("(%p)->(%d)\n", This, dispID);
+    FIXME("(%p)->(%ld)\n", This, dispID);
     return E_NOTIMPL;
 }

diff --git a/dlls/ieframe/events.c b/dlls/ieframe/events.c
index eef1c17e6c0..c77da31d87e 100644
--- a/dlls/ieframe/events.c
+++ b/dlls/ieframe/events.c
@@ -167,7 +167,7 @@ static ULONG WINAPI EnumConnections_AddRef(IEnumConnections *iface)
     EnumConnections *This = impl_from_IEnumConnections(iface);
     LONG ref = InterlockedIncrement(&This->ref);

-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);

return ref;
 }
@@ -177,7 +177,7 @@ static ULONG WINAPI EnumConnections_Release(IEnumConnections *iface)
     EnumConnections *This = impl_from_IEnumConnections(iface);
     LONG ref = InterlockedDecrement(&This->ref);

-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);

if(!ref) {
         IConnectionPoint_Release(&This->cp->IConnectionPoint_iface);
@@ -192,7 +192,7 @@ static HRESULT WINAPI EnumConnections_Next(IEnumConnections *iface, ULONG cConne
     EnumConnections *This = impl_from_IEnumConnections(iface);
     ULONG cnt = 0;

-    TRACE("(%p)->(%u %p %p)\n", This, cConnections, pgcd, pcFetched);
+    TRACE("(%p)->(%lu %p %p)\n", This, cConnections, pgcd, pcFetched);

while(cConnections--) {
         while(This->iter < This->cp->sinks_size && !This->cp->sinks[This->iter])
@@ -214,7 +214,7 @@ static HRESULT WINAPI EnumConnections_Next(IEnumConnections *iface, ULONG cConne
 static HRESULT WINAPI EnumConnections_Skip(IEnumConnections *iface, ULONG cConnections)
 {
     EnumConnections *This = impl_from_IEnumConnections(iface);
-    FIXME("(%p)->(%u)\n", This, cConnections);
+    FIXME("(%p)->(%lu)\n", This, cConnections);
     return E_NOTIMPL;
 }

@@ -342,7 +342,7 @@ static HRESULT WINAPI ConnectionPoint_Unadvise(IConnectionPoint *iface, DWORD dw
 {
     ConnectionPoint *This = impl_from_IConnectionPoint(iface);

-    TRACE("(%p)->(%d)\n", This, dwCookie);
+    TRACE("(%p)->(%ld)\n", This, dwCookie);

if(!dwCookie || dwCookie > This->sinks_size || !This->sinks[dwCookie-1])
         return CONNECT_E_NOCONNECTION;
diff --git a/dlls/ieframe/ie.c b/dlls/ieframe/ie.c
index 5d9545e95d6..ca3771f730a 100644
--- a/dlls/ieframe/ie.c
+++ b/dlls/ieframe/ie.c
@@ -74,7 +74,7 @@ static ULONG WINAPI InternetExplorer_AddRef(IWebBrowser2 *iface)
 {
     InternetExplorer *This = impl_from_IWebBrowser2(iface);
     LONG ref = InterlockedIncrement(&This->ref);
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
     return ref;
 }

@@ -83,7 +83,7 @@ static ULONG WINAPI InternetExplorer_Release(IWebBrowser2 *iface)
     InternetExplorer *This = impl_from_IWebBrowser2(iface);
     LONG ref = InterlockedDecrement(&This->ref);

-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);

if(!ref) {
         deactivate_document(&This->doc_host);
@@ -117,7 +117,7 @@ static HRESULT WINAPI InternetExplorer_GetTypeInfo(IWebBrowser2 *iface, UINT iTI
     ITypeInfo *typeinfo;
     HRESULT hres;

-    TRACE("(%p)->(%d %d %p)\n", This, iTInfo, lcid, ppTInfo);
+    TRACE("(%p)->(%d %ld %p)\n", This, iTInfo, lcid, ppTInfo);

hres = get_typeinfo(IWebBrowser2_tid, &typeinfo);
     if(FAILED(hres))
@@ -136,7 +136,7 @@ static HRESULT WINAPI InternetExplorer_GetIDsOfNames(IWebBrowser2 *iface, REFIID
     ITypeInfo *typeinfo;
     HRESULT hres;

-    TRACE("(%p)->(%s %p %d %d %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
+    TRACE("(%p)->(%s %p %d %ld %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
           lcid, rgDispId);

hres = get_typeinfo(IWebBrowser2_tid, &typeinfo);
@@ -155,7 +155,7 @@ static HRESULT WINAPI InternetExplorer_Invoke(IWebBrowser2 *iface, DISPID dispId
     ITypeInfo *typeinfo;
     HRESULT hres;

-    TRACE("(%p)->(%d %s %d %08x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
+    TRACE("(%p)->(%ld %s %ld %08x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
             lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr);

hres = get_typeinfo(IWebBrowser2_tid, &typeinfo);
@@ -283,7 +283,7 @@ static HRESULT WINAPI InternetExplorer_get_Left(IWebBrowser2 *iface, LONG *pl)
 static HRESULT WINAPI InternetExplorer_put_Left(IWebBrowser2 *iface, LONG Left)
 {
     InternetExplorer *This = impl_from_IWebBrowser2(iface);
-    FIXME("(%p)->(%d)\n", This, Left);
+    FIXME("(%p)->(%ld)\n", This, Left);
     return E_NOTIMPL;
 }

@@ -297,7 +297,7 @@ static HRESULT WINAPI InternetExplorer_get_Top(IWebBrowser2 *iface, LONG *pl)
 static HRESULT WINAPI InternetExplorer_put_Top(IWebBrowser2 *iface, LONG Top)
 {
     InternetExplorer *This = impl_from_IWebBrowser2(iface);
-    FIXME("(%p)->(%d)\n", This, Top);
+    FIXME("(%p)->(%ld)\n", This, Top);
     return E_NOTIMPL;
 }

@@ -311,7 +311,7 @@ static HRESULT WINAPI InternetExplorer_get_Width(IWebBrowser2 *iface, LONG *pl)
 static HRESULT WINAPI InternetExplorer_put_Width(IWebBrowser2 *iface, LONG Width)
 {
     InternetExplorer *This = impl_from_IWebBrowser2(iface);
-    FIXME("(%p)->(%d)\n", This, Width);
+    FIXME("(%p)->(%ld)\n", This, Width);
     return E_NOTIMPL;
 }

@@ -325,7 +325,7 @@ static HRESULT WINAPI InternetExplorer_get_Height(IWebBrowser2 *iface, LONG *pl)
 static HRESULT WINAPI InternetExplorer_put_Height(IWebBrowser2 *iface, LONG Height)
 {
     InternetExplorer *This = impl_from_IWebBrowser2(iface);
-    FIXME("(%p)->(%d)\n", This, Height);
+    FIXME("(%p)->(%ld)\n", This, Height);
     return E_NOTIMPL;
 }

@@ -757,7 +757,7 @@ DWORD release_extern_ref(InternetExplorer *This, BOOL last_closes)
 {
     LONG ref = InterlockedDecrement(&This->extern_ref);

-    TRACE("ref = %d\n", ref);
+    TRACE("ref = %ld\n", ref);

if(ref)
         return ref;
@@ -793,7 +793,7 @@ static DWORD WINAPI ExternalConnection_AddConnection(IExternalConnection *iface,
 {
     InternetExplorer *This = impl_from_IExternalConnection(iface);

-    TRACE("(%p)->(%x %x)\n", This, extconn, reserved);
+    TRACE("(%p)->(%lx %lx)\n", This, extconn, reserved);

if(extconn != EXTCONN_STRONG)
         return 0;
@@ -806,7 +806,7 @@ static DWORD WINAPI ExternalConnection_ReleaseConnection(IExternalConnection *if
 {
     InternetExplorer *This = impl_from_IExternalConnection(iface);

-    TRACE("(%p)->(%x %x %x)\n", This, extconn, reserved, fLastReleaseCloses);
+    TRACE("(%p)->(%lx %lx %x)\n", This, extconn, reserved, fLastReleaseCloses);

if(extconn != EXTCONN_STRONG)
         return 0;
diff --git a/dlls/ieframe/ieframe_main.c b/dlls/ieframe/ieframe_main.c
index ca976175e69..8775e244d1c 100644
--- a/dlls/ieframe/ieframe_main.c
+++ b/dlls/ieframe/ieframe_main.c
@@ -49,7 +49,7 @@ static HRESULT load_typelib(void)

hres = LoadRegTypeLib(&LIBID_SHDocVw, 1, 1, LOCALE_SYSTEM_DEFAULT, &tl);
     if(FAILED(hres)) {
-        ERR("LoadRegTypeLib failed: %08x\n", hres);
+        ERR("LoadRegTypeLib failed: %08lx\n", hres);
         return hres;
     }

@@ -72,7 +72,7 @@ HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo)

hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti);
         if(FAILED(hres)) {
-            ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hres);
+            ERR("GetTypeInfoOfGuid(%s) failed: %08lx\n", debugstr_guid(tid_ids[tid]), hres);
             return hres;
         }

@@ -183,7 +183,7 @@ static IClassFactory CUrlHistoryFactory = { &CUrlHistoryFactoryVtbl };
  */
 BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
 {
-    TRACE("(%p %d %p)\n", hInstDLL, fdwReason, lpv);
+    TRACE("(%p %ld %p)\n", hInstDLL, fdwReason, lpv);

switch(fdwReason)
     {
@@ -275,7 +275,7 @@ LONG WINAPI SetQueryNetSessionCount(DWORD session_op)
 {
     static LONG session_count;

-    TRACE("(%x)\n", session_op);
+    TRACE("(%lx)\n", session_op);

switch(session_op)
     {
diff --git a/dlls/ieframe/iehtmlwnd.c b/dlls/ieframe/iehtmlwnd.c
index fe97c6373db..44e58a2cdff 100644
--- a/dlls/ieframe/iehtmlwnd.c
+++ b/dlls/ieframe/iehtmlwnd.c
@@ -157,14 +157,14 @@ static HRESULT WINAPI IEHTMLWindow2_setTimeout(IHTMLWindow2 *iface, BSTR express
         LONG msec, VARIANT *language, LONG *timerID)
 {
     IEHTMLWindow *This = impl_from_IHTMLWindow2(iface);
-    FIXME("(%p)->(%s %d %s %p)\n", This, debugstr_w(expression), msec, debugstr_variant(language), timerID);
+    FIXME("(%p)->(%s %ld %s %p)\n", This, debugstr_w(expression), msec, debugstr_variant(language), timerID);
     return E_NOTIMPL;
 }

static HRESULT WINAPI IEHTMLWindow2_clearTimeout(IHTMLWindow2 *iface, LONG timerID)
 {
     IEHTMLWindow *This = impl_from_IHTMLWindow2(iface);
-    FIXME("(%p)->(%d)\n", This, timerID);
+    FIXME("(%p)->(%ld)\n", This, timerID);
     return E_NOTIMPL;
 }

@@ -505,7 +505,7 @@ static HRESULT WINAPI IEHTMLWindow2_blur(IHTMLWindow2 *iface)
 static HRESULT WINAPI IEHTMLWindow2_scroll(IHTMLWindow2 *iface, LONG x, LONG y)
 {
     IEHTMLWindow *This = impl_from_IHTMLWindow2(iface);
-    FIXME("(%p)->(%d %d)\n", This, x, y);
+    FIXME("(%p)->(%ld %ld)\n", This, x, y);
     return E_NOTIMPL;
 }

@@ -520,14 +520,14 @@ static HRESULT WINAPI IEHTMLWindow2_setInterval(IHTMLWindow2 *iface, BSTR expres
         LONG msec, VARIANT *language, LONG *timerID)
 {
     IEHTMLWindow *This = impl_from_IHTMLWindow2(iface);
-    FIXME("(%p)->(%s %d %s %p)\n", This, debugstr_w(expression), msec, debugstr_variant(language), timerID);
+    FIXME("(%p)->(%s %ld %s %p)\n", This, debugstr_w(expression), msec, debugstr_variant(language), timerID);
     return E_NOTIMPL;
 }

static HRESULT WINAPI IEHTMLWindow2_clearInterval(IHTMLWindow2 *iface, LONG timerID)
 {
     IEHTMLWindow *This = impl_from_IHTMLWindow2(iface);
-    FIXME("(%p)->(%d)\n", This, timerID);
+    FIXME("(%p)->(%ld)\n", This, timerID);
     return E_NOTIMPL;
 }

@@ -563,42 +563,42 @@ static HRESULT WINAPI IEHTMLWindow2_toString(IHTMLWindow2 *iface, BSTR *String)
 static HRESULT WINAPI IEHTMLWindow2_scrollBy(IHTMLWindow2 *iface, LONG x, LONG y)
 {
     IEHTMLWindow *This = impl_from_IHTMLWindow2(iface);
-    FIXME("(%p)->(%d %d)\n", This, x, y);
+    FIXME("(%p)->(%ld %ld)\n", This, x, y);
     return E_NOTIMPL;
 }

static HRESULT WINAPI IEHTMLWindow2_scrollTo(IHTMLWindow2 *iface, LONG x, LONG y)
 {
     IEHTMLWindow *This = impl_from_IHTMLWindow2(iface);
-    FIXME("(%p)->(%d %d)\n", This, x, y);
+    FIXME("(%p)->(%ld %ld)\n", This, x, y);
     return E_NOTIMPL;
 }

static HRESULT WINAPI IEHTMLWindow2_moveTo(IHTMLWindow2 *iface, LONG x, LONG y)
 {
     IEHTMLWindow *This = impl_from_IHTMLWindow2(iface);
-    FIXME("(%p)->(%d %d)\n", This, x, y);
+    FIXME("(%p)->(%ld %ld)\n", This, x, y);
     return E_NOTIMPL;
 }

static HRESULT WINAPI IEHTMLWindow2_moveBy(IHTMLWindow2 *iface, LONG x, LONG y)
 {
     IEHTMLWindow *This = impl_from_IHTMLWindow2(iface);
-    FIXME("(%p)->(%d %d)\n", This, x, y);
+    FIXME("(%p)->(%ld %ld)\n", This, x, y);
     return E_NOTIMPL;
 }

static HRESULT WINAPI IEHTMLWindow2_resizeTo(IHTMLWindow2 *iface, LONG x, LONG y)
 {
     IEHTMLWindow *This = impl_from_IHTMLWindow2(iface);
-    FIXME("(%p)->(%d %d)\n", This, x, y);
+    FIXME("(%p)->(%ld %ld)\n", This, x, y);
     return E_NOTIMPL;
 }

static HRESULT WINAPI IEHTMLWindow2_resizeBy(IHTMLWindow2 *iface, LONG x, LONG y)
 {
     IEHTMLWindow *This = impl_from_IHTMLWindow2(iface);
-    FIXME("(%p)->(%d %d)\n", This, x, y);
+    FIXME("(%p)->(%ld %ld)\n", This, x, y);
     return E_NOTIMPL;
 }

diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c
index 00883c80e77..27b72a64fa7 100644
--- a/dlls/ieframe/iexplore.c
+++ b/dlls/ieframe/iexplore.c
@@ -672,7 +672,7 @@ static LRESULT WINAPI ie_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM
         ShowWindow(hwnd, SW_HIDE);
         return 0;
     case WM_SHOWWINDOW:
-        TRACE("WM_SHOWWINDOW %lx\n", wparam);
+        TRACE("WM_SHOWWINDOW %Ix\n", wparam);
         if(wparam) {
             IWebBrowser2_AddRef(&This->IWebBrowser2_iface);
             InterlockedIncrement(&This->extern_ref);
@@ -874,7 +874,7 @@ static ULONG WINAPI InternetExplorerManager_AddRef(IInternetExplorerManager *ifa
     InternetExplorerManager *This = impl_from_IInternetExplorerManager(iface);
     ULONG ref = InterlockedIncrement(&This->ref);

-    TRACE("(%p) increasing refcount to %u\n", iface, ref);
+    TRACE("(%p) increasing refcount to %lu\n", iface, ref);

return ref;
 }
@@ -884,7 +884,7 @@ static ULONG WINAPI InternetExplorerManager_Release(IInternetExplorerManager *if
     InternetExplorerManager *This = impl_from_IInternetExplorerManager(iface);
     ULONG ref = InterlockedDecrement(&This->ref);

-    TRACE("(%p) decreasing refcount to %u\n", iface, ref);
+    TRACE("(%p) decreasing refcount to %lu\n", iface, ref);

if (ref == 0)
     {
@@ -897,7 +897,7 @@ static ULONG WINAPI InternetExplorerManager_Release(IInternetExplorerManager *if

static HRESULT WINAPI InternetExplorerManager_CreateObject(IInternetExplorerManager *iface, DWORD config, LPCWSTR url, REFIID riid, void **ppv)
 {
-    FIXME("(%p)->(0x%x, %s, %s, %p) stub!\n", iface, config, debugstr_w(url), debugstr_guid(riid), ppv);
+    FIXME("(%p)->(0x%lx, %s, %s, %p) stub!\n", iface, config, debugstr_w(url), debugstr_guid(riid), ppv);

return E_NOTIMPL;
 }
@@ -1172,7 +1172,7 @@ DWORD WINAPI IEWinMain(const WCHAR *cmdline, int nShowWindow)

if (FAILED(hres))
     {
-        ERR("failed to register CLSID_InternetExplorer%s: %08x\n", manager ? "Manager" : "", hres);
+        ERR("failed to register CLSID_InternetExplorer%s: %08lx\n", manager ? "Manager" : "", hres);
         CoUninitialize();
         ExitProcess(1);
     }
diff --git a/dlls/ieframe/intshcut.c b/dlls/ieframe/intshcut.c
index 4a0e870ca09..8938a2d9c71 100644
--- a/dlls/ieframe/intshcut.c
+++ b/dlls/ieframe/intshcut.c
@@ -224,9 +224,9 @@ static HRESULT WINAPI UniformResourceLocatorW_SetUrl(IUniformResourceLocatorW *u
 {
     WCHAR *newURL = NULL;
     InternetShortcut *This = impl_from_IUniformResourceLocatorW(url);
-    TRACE("(%p, %s, 0x%x)\n", url, debugstr_w(pcszURL), dwInFlags);
+    TRACE("(%p, %s, 0x%lx)\n", url, debugstr_w(pcszURL), dwInFlags);
     if (dwInFlags != 0)
-        FIXME("ignoring unsupported flags 0x%x\n", dwInFlags);
+        FIXME("ignoring unsupported flags 0x%lx\n", dwInFlags);
     if (pcszURL != NULL)
     {
         newURL = co_strdupW(pcszURL);
@@ -327,9 +327,9 @@ static HRESULT WINAPI UniformResourceLocatorA_SetUrl(IUniformResourceLocatorA *u
 {
     WCHAR *newURL = NULL;
     InternetShortcut *This = impl_from_IUniformResourceLocatorA(url);
-    TRACE("(%p, %s, 0x%x)\n", url, debugstr_a(pcszURL), dwInFlags);
+    TRACE("(%p, %s, 0x%lx)\n", url, debugstr_a(pcszURL), dwInFlags);
     if (dwInFlags != 0)
-        FIXME("ignoring unsupported flags 0x%x\n", dwInFlags);
+        FIXME("ignoring unsupported flags 0x%lx\n", dwInFlags);
     if (pcszURL != NULL)
     {
         newURL = co_strdupAtoW(pcszURL);
@@ -468,10 +468,10 @@ static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileNam
     WCHAR *iconfile;
     WCHAR *iconindexstring;

-    TRACE("(%p, %s, 0x%x)\n", pFile, debugstr_w(pszFileName), dwMode);
+    TRACE("(%p, %s, 0x%lx)\n", pFile, debugstr_w(pszFileName), dwMode);

if (dwMode != 0)
-        FIXME("ignoring unimplemented mode 0x%x\n", dwMode);
+        FIXME("ignoring unimplemented mode 0x%lx\n", dwMode);

filename = co_strdupW(pszFileName);
     if (!filename)
@@ -512,7 +512,7 @@ static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileNam
         pv.pwszVal = iconfile;
         hr = IPropertyStorage_WriteMultiple(pPropStg, 1, &ps, &pv, 0);
         if (FAILED(hr))
-            TRACE("Failed to store the iconfile to our property storage.  hr = 0x%x\n", hr);
+            TRACE("Failed to store the iconfile to our property storage.  hr = 0x%lx\n", hr);
     }
     CoTaskMemFree(iconfile);

@@ -528,7 +528,7 @@ static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileNam
         pv.iVal = iconindex;
         hr = IPropertyStorage_WriteMultiple(pPropStg, 1, &ps, &pv, 0);
         if (FAILED(hr))
-           TRACE("Failed to store the iconindex to our property storage.  hr = 0x%x\n", hr);
+           TRACE("Failed to store the iconindex to our property storage.  hr = 0x%lx\n", hr);
     }
     CoTaskMemFree(iconindexstring);

@@ -702,7 +702,7 @@ static HRESULT WINAPI PropertySetStorage_Create(
         IPropertyStorage **ppprstg)
 {
     InternetShortcut *This = impl_from_IPropertySetStorage(iface);
-    TRACE("(%s, %p, 0x%x, 0x%x, %p)\n", debugstr_guid(rfmtid), pclsid, grfFlags, grfMode, ppprstg);
+    TRACE("(%s, %p, 0x%lx, 0x%lx, %p)\n", debugstr_guid(rfmtid), pclsid, grfFlags, grfMode, ppprstg);

return IPropertySetStorage_Create(This->property_set_storage,
                                       rfmtid,
@@ -719,7 +719,7 @@ static HRESULT WINAPI PropertySetStorage_Open(
         IPropertyStorage **ppprstg)
 {
     InternetShortcut *This = impl_from_IPropertySetStorage(iface);
-    TRACE("(%s, 0x%x, %p)\n", debugstr_guid(rfmtid), grfMode, ppprstg);
+    TRACE("(%s, 0x%lx, %p)\n", debugstr_guid(rfmtid), grfMode, ppprstg);

/* Note:  The |STGM_SHARE_EXCLUSIVE is to cope with a bug in the implementation.  Should be fixed in ole32. */
     return IPropertySetStorage_Open(This->property_set_storage,
diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c
index 9efdacc080e..cb72464914d 100644
--- a/dlls/ieframe/navigate.c
+++ b/dlls/ieframe/navigate.c
@@ -68,15 +68,15 @@ static void dump_BINDINFO(BINDINFO *bi)

TRACE("\n"
             "BINDINFO = {\n"
-            "    %d, %s,\n"
-            "    {%d, %p, %p},\n"
+            "    %ld, %s,\n"
+            "    {%ld, %p, %p},\n"
             "    %s,\n"
             "    %s,\n"
             "    %s,\n"
-            "    %d, %08x, %d, %d\n"
-            "    {%d %p %x},\n"
+            "    %ld, %08lx, %ld, %ld\n"
+            "    {%ld %p %x},\n"
             "    %s\n"
-            "    %p, %d\n"
+            "    %p, %ld\n"
             "}\n",

bi->cbSize, debugstr_w(bi->szExtraInfo),
@@ -105,7 +105,7 @@ static void set_status_text(BindStatusCallback *This, ULONG statuscode, LPCWSTR
     if(!This->doc_host)
         return;

-    TRACE("(%p, %d, %s)\n", This, statuscode, debugstr_w(str));
+    TRACE("(%p, %ld, %s)\n", This, statuscode, debugstr_w(str));
     buffer[0] = 0;
     if (statuscode && str && *str) {
         fmt[0] = 0;
@@ -194,7 +194,7 @@ static ULONG WINAPI BindStatusCallback_AddRef(IBindStatusCallback *iface)
     BindStatusCallback *This = impl_from_IBindStatusCallback(iface);
     LONG ref = InterlockedIncrement(&This->ref);

-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);

return ref;
 }
@@ -204,7 +204,7 @@ static ULONG WINAPI BindStatusCallback_Release(IBindStatusCallback *iface)
     BindStatusCallback *This = impl_from_IBindStatusCallback(iface);
     LONG ref = InterlockedDecrement(&This->ref);

-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);

if(!ref) {
         if(This->doc_host)
@@ -226,7 +226,7 @@ static HRESULT WINAPI BindStatusCallback_OnStartBinding(IBindStatusCallback *ifa
 {
     BindStatusCallback *This = impl_from_IBindStatusCallback(iface);

-    TRACE("(%p)->(%d %p)\n", This, dwReserved, pbind);
+    TRACE("(%p)->(%ld %p)\n", This, dwReserved, pbind);

This->binding = pbind;
     IBinding_AddRef(This->binding);
@@ -246,7 +246,7 @@ static HRESULT WINAPI BindStatusCallback_OnLowResource(IBindStatusCallback *ifac
        DWORD reserved)
 {
     BindStatusCallback *This = impl_from_IBindStatusCallback(iface);
-    FIXME("(%p)->(%d)\n", This, reserved);
+    FIXME("(%p)->(%ld)\n", This, reserved);
     return E_NOTIMPL;
 }

@@ -275,7 +275,7 @@ static HRESULT WINAPI BindStatusCallback_OnProgress(IBindStatusCallback *iface,
     BindStatusCallback *This = impl_from_IBindStatusCallback(iface);
     DWORD status_code;

-    TRACE("(%p)->(%d %d %d %s)\n", This, ulProgress, ulProgressMax, ulStatusCode,
+    TRACE("(%p)->(%ld %ld %ld %s)\n", This, ulProgress, ulProgressMax, ulStatusCode,
           debugstr_w(szStatusText));

switch(ulStatusCode) {
@@ -302,7 +302,7 @@ static HRESULT WINAPI BindStatusCallback_OnProgress(IBindStatusCallback *iface,
     case BINDSTATUS_ENDSYNCOPERATION:
         return S_OK;
     default:
-        FIXME("status code %u\n", ulStatusCode);
+        FIXME("status code %lu\n", ulStatusCode);
     }

return S_OK;
@@ -358,7 +358,7 @@ static HRESULT WINAPI BindStatusCallback_OnStopBinding(IBindStatusCallback *ifac
 {
     BindStatusCallback *This = impl_from_IBindStatusCallback(iface);

-    TRACE("(%p)->(%08x %s)\n", This, hresult, debugstr_w(szError));
+    TRACE("(%p)->(%08lx %s)\n", This, hresult, debugstr_w(szError));

set_status_text(This, 0, emptyW);

@@ -405,7 +405,7 @@ static HRESULT WINAPI BindStatusCallback_OnDataAvailable(IBindStatusCallback *if
         DWORD grfBSCF, DWORD dwSize, FORMATETC *pformatetc, STGMEDIUM *pstgmed)
 {
     BindStatusCallback *This = impl_from_IBindStatusCallback(iface);
-    FIXME("(%p)->(%08x %d %p %p)\n", This, grfBSCF, dwSize, pformatetc, pstgmed);
+    FIXME("(%p)->(%08lx %ld %p %p)\n", This, grfBSCF, dwSize, pformatetc, pstgmed);
     return E_NOTIMPL;
 }

@@ -462,7 +462,7 @@ static HRESULT WINAPI HttpNegotiate_BeginningTransaction(IHttpNegotiate *iface,
 {
     BindStatusCallback *This = impl_from_IHttpNegotiate(iface);

-    TRACE("(%p)->(%s %s %d %p)\n", This, debugstr_w(szURL), debugstr_w(szHeaders),
+    TRACE("(%p)->(%s %s %ld %p)\n", This, debugstr_w(szURL), debugstr_w(szHeaders),
           dwReserved, pszAdditionalHeaders);

if(This->headers) {
@@ -479,7 +479,7 @@ static HRESULT WINAPI HttpNegotiate_OnResponse(IHttpNegotiate *iface,
         LPWSTR *pszAdditionalRequestHeaders)
 {
     BindStatusCallback *This = impl_from_IHttpNegotiate(iface);
-    TRACE("(%p)->(%d %s %s %p)\n", This, dwResponseCode, debugstr_w(szResponseHeaders),
+    TRACE("(%p)->(%ld %s %s %p)\n", This, dwResponseCode, debugstr_w(szResponseHeaders),
           debugstr_w(szRequestHeaders), pszAdditionalRequestHeaders);
     return S_OK;
 }
@@ -531,7 +531,7 @@ static HRESULT WINAPI HttpSecurity_GetWindow(IHttpSecurity *iface, REFGUID rguid
 static HRESULT WINAPI HttpSecurity_OnSecurityProblem(IHttpSecurity *iface, DWORD dwProblem)
 {
     BindStatusCallback *This = impl_from_IHttpSecurity(iface);
-    FIXME("(%p)->(%u)\n", This, dwProblem);
+    FIXME("(%p)->(%lu)\n", This, dwProblem);
     return S_FALSE;
 }

@@ -677,7 +677,7 @@ static HRESULT create_moniker(LPCWSTR url, IMoniker **mon)
     hres = UrlApplySchemeW(url, new_url, &size, URL_APPLY_GUESSSCHEME | URL_APPLY_GUESSFILE | URL_APPLY_DEFAULT);
     TRACE("was %s got %s\n", debugstr_w(url), debugstr_w(new_url));
     if(FAILED(hres)) {
-        WARN("UrlApplyScheme failed: %08x\n", hres);
+        WARN("UrlApplyScheme failed: %08lx\n", hres);
         return hres;
     }

@@ -701,7 +701,7 @@ static HRESULT bind_to_object(DocHost *This, IMoniker *mon, LPCWSTR url, IBindCt

hres = IMoniker_GetDisplayName(mon, 0, NULL, &display_name);
     if(FAILED(hres)) {
-        FIXME("GetDisplayName failed: %08x\n", hres);
+        FIXME("GetDisplayName failed: %08lx\n", hres);
         IMoniker_Release(mon);
         return hres;
     }
@@ -724,7 +724,7 @@ static HRESULT bind_to_object(DocHost *This, IMoniker *mon, LPCWSTR url, IBindCt
     }else if(try_application_url(url)) {
         hres = S_OK;
     }else {
-        FIXME("BindToObject failed: %08x\n", hres);
+        FIXME("BindToObject failed: %08lx\n", hres);
     }

IMoniker_Release(mon);
@@ -761,7 +761,7 @@ static void html_window_navigate(DocHost *This, IHTMLPrivateWindow *window, BSTR
     hres = IHTMLPrivateWindow_SuperNavigate(window, url, empty_str, NULL, NULL, &post_data_var, &headers_var, 0);
     SysFreeString(empty_str);
     if(FAILED(hres))
-        WARN("SuprtNavigate failed: %08x\n", hres);
+        WARN("SuprtNavigate failed: %08lx\n", hres);
 }

typedef struct {
@@ -808,7 +808,7 @@ static void doc_navigate_proc(DocHost *This, task_header_t *t)
         html_window_navigate(This, priv_window, task->url, task->headers, task->post_data);
         IHTMLPrivateWindow_Release(priv_window);
     }else {
-        WARN("Could not get IHTMLPrivateWindow iface: %08x\n", hres);
+        WARN("Could not get IHTMLPrivateWindow iface: %08lx\n", hres);
     }
 }

@@ -983,7 +983,7 @@ HRESULT navigate_url(DocHost *This, LPCWSTR url, const VARIANT *Flags,
             hres = UrlApplySchemeW(url, new_url, &size,
                     URL_APPLY_GUESSSCHEME | URL_APPLY_GUESSFILE | URL_APPLY_DEFAULT);
             if(FAILED(hres)) {
-                WARN("UrlApplyScheme failed: %08x\n", hres);
+                WARN("UrlApplyScheme failed: %08lx\n", hres);
                 new_url[0] = 0;
             }
         }
@@ -1020,7 +1020,7 @@ static HRESULT navigate_hlink(DocHost *This, IMoniker *mon, IBindCtx *bindctx,

hres = IMoniker_GetDisplayName(mon, 0, NULL, &url);
     if(FAILED(hres))
-        FIXME("GetDisplayName failed: %08x\n", hres);
+        FIXME("GetDisplayName failed: %08lx\n", hres);

hres = IBindStatusCallback_QueryInterface(callback, &IID_IHttpNegotiate,
                                               (void**)&http_negotiate);
@@ -1192,10 +1192,10 @@ static HRESULT WINAPI HlinkFrame_Navigate(IHlinkFrame *iface, DWORD grfHLNF, LPB
     IMoniker *mon;
     LPWSTR location = NULL;

-    TRACE("(%p)->(%08x %p %p %p)\n", This, grfHLNF, pbc, pibsc, pihlNavigate);
+    TRACE("(%p)->(%08lx %p %p %p)\n", This, grfHLNF, pbc, pibsc, pihlNavigate);

if(grfHLNF)
-        FIXME("unsupported grfHLNF=%08x\n", grfHLNF);
+        FIXME("unsupported grfHLNF=%08lx\n", grfHLNF);

/* Windows calls GetTargetFrameName here. */

@@ -1220,7 +1220,7 @@ static HRESULT WINAPI HlinkFrame_OnNavigate(IHlinkFrame *iface, DWORD grfHLNF,
         IMoniker *pimkTarget, LPCWSTR pwzLocation, LPCWSTR pwzFriendlyName, DWORD dwreserved)
 {
     HlinkFrame *This = impl_from_IHlinkFrame(iface);
-    FIXME("(%p)->(%08x %p %s %s %d)\n", This, grfHLNF, pimkTarget, debugstr_w(pwzLocation),
+    FIXME("(%p)->(%08lx %p %s %s %ld)\n", This, grfHLNF, pimkTarget, debugstr_w(pwzLocation),
           debugstr_w(pwzFriendlyName), dwreserved);
     return E_NOTIMPL;
 }
@@ -1229,7 +1229,7 @@ static HRESULT WINAPI HlinkFrame_UpdateHlink(IHlinkFrame *iface, ULONG uHLID,
         IMoniker *pimkTarget, LPCWSTR pwzLocation, LPCWSTR pwzFriendlyName)
 {
     HlinkFrame *This = impl_from_IHlinkFrame(iface);
-    FIXME("(%p)->(%u %p %s %s)\n", This, uHLID, pimkTarget, debugstr_w(pwzLocation),
+    FIXME("(%p)->(%lu %p %s %s)\n", This, uHLID, pimkTarget, debugstr_w(pwzLocation),
           debugstr_w(pwzFriendlyName));
     return E_NOTIMPL;
 }
@@ -1293,7 +1293,7 @@ static HRESULT WINAPI TargetFrame_FindFrame(ITargetFrame *iface, LPCWSTR pszTarg
         IUnknown *ppunkContextFrame, DWORD dwFlags, IUnknown **ppunkTargetFrame)
 {
     HlinkFrame *This = impl_from_ITargetFrame(iface);
-    FIXME("(%p)->(%s %p %x %p)\n", This, debugstr_w(pszTargetName),
+    FIXME("(%p)->(%s %p %lx %p)\n", This, debugstr_w(pszTargetName),
             ppunkContextFrame, dwFlags, ppunkTargetFrame);
     return E_NOTIMPL;
 }
@@ -1322,7 +1322,7 @@ static HRESULT WINAPI TargetFrame_GetFramesContainer(ITargetFrame *iface, IOleCo
 static HRESULT WINAPI TargetFrame_SetFrameOptions(ITargetFrame *iface, DWORD dwFlags)
 {
     HlinkFrame *This = impl_from_ITargetFrame(iface);
-    FIXME("(%p)->(%x)\n", This, dwFlags);
+    FIXME("(%p)->(%lx)\n", This, dwFlags);
     return E_NOTIMPL;
 }

@@ -1336,7 +1336,7 @@ static HRESULT WINAPI TargetFrame_GetFrameOptions(ITargetFrame *iface, DWORD *pd
 static HRESULT WINAPI TargetFrame_SetFrameMargins(ITargetFrame *iface, DWORD dwWidth, DWORD dwHeight)
 {
     HlinkFrame *This = impl_from_ITargetFrame(iface);
-    FIXME("(%p)->(%d %d)\n", This, dwWidth, dwHeight);
+    FIXME("(%p)->(%ld %ld)\n", This, dwWidth, dwHeight);
     return E_NOTIMPL;
 }

@@ -1350,7 +1350,7 @@ static HRESULT WINAPI TargetFrame_GetFrameMargins(ITargetFrame *iface, DWORD *pd
 static HRESULT WINAPI TargetFrame_RemoteNavigate(ITargetFrame *iface, ULONG cLength, ULONG *pulData)
 {
     HlinkFrame *This = impl_from_ITargetFrame(iface);
-    FIXME("(%p)->(%u %p)\n", This, cLength, pulData);
+    FIXME("(%p)->(%lu %p)\n", This, cLength, pulData);
     return E_NOTIMPL;
 }

@@ -1456,7 +1456,7 @@ static HRESULT WINAPI TargetFrame2_GetFramesContainer(ITargetFrame2 *iface, IOle
 static HRESULT WINAPI TargetFrame2_SetFrameOptions(ITargetFrame2 *iface, DWORD dwFlags)
 {
     HlinkFrame *This = impl_from_ITargetFrame2(iface);
-    FIXME("(%p)->(%x)\n", This, dwFlags);
+    FIXME("(%p)->(%lx)\n", This, dwFlags);
     return E_NOTIMPL;
 }

@@ -1470,7 +1470,7 @@ static HRESULT WINAPI TargetFrame2_GetFrameOptions(ITargetFrame2 *iface, DWORD *
 static HRESULT WINAPI TargetFrame2_SetFrameMargins(ITargetFrame2 *iface, DWORD dwWidth, DWORD dwHeight)
 {
     HlinkFrame *This = impl_from_ITargetFrame2(iface);
-    FIXME("(%p)->(%d %d)\n", This, dwWidth, dwHeight);
+    FIXME("(%p)->(%ld %ld)\n", This, dwWidth, dwHeight);
     return E_NOTIMPL;
 }

@@ -1484,7 +1484,7 @@ static HRESULT WINAPI TargetFrame2_GetFrameMargins(ITargetFrame2 *iface, DWORD *
 static HRESULT WINAPI TargetFrame2_FindFrame(ITargetFrame2 *iface, LPCWSTR pszTargetName, DWORD dwFlags, IUnknown **ppunkTargetFrame)
 {
     HlinkFrame *This = impl_from_ITargetFrame2(iface);
-    FIXME("(%p)->(%s %x %p)\n", This, debugstr_w(pszTargetName), dwFlags, ppunkTargetFrame);
+    FIXME("(%p)->(%s %lx %p)\n", This, debugstr_w(pszTargetName), dwFlags, ppunkTargetFrame);
     return E_NOTIMPL;
 }

@@ -1540,7 +1540,7 @@ static HRESULT WINAPI TargetFramePriv2_FindFrameDownwards(ITargetFramePriv2 *ifa
         LPCWSTR pszTargetName, DWORD dwFlags, IUnknown **ppunkTargetFrame)
 {
     HlinkFrame *This = impl_from_ITargetFramePriv2(iface);
-    FIXME("(%p)->(%s %x %p)\n", This, debugstr_w(pszTargetName), dwFlags, ppunkTargetFrame);
+    FIXME("(%p)->(%s %lx %p)\n", This, debugstr_w(pszTargetName), dwFlags, ppunkTargetFrame);
     return E_NOTIMPL;
 }

@@ -1548,7 +1548,7 @@ static HRESULT WINAPI TargetFramePriv2_FindFrameInContext(ITargetFramePriv2 *ifa
         LPCWSTR pszTargetName, IUnknown *punkContextFrame, DWORD dwFlags, IUnknown **ppunkTargetFrame)
 {
     HlinkFrame *This = impl_from_ITargetFramePriv2(iface);
-    FIXME("(%p)->(%s %p %x %p)\n", This, debugstr_w(pszTargetName), punkContextFrame, dwFlags, ppunkTargetFrame);
+    FIXME("(%p)->(%s %p %lx %p)\n", This, debugstr_w(pszTargetName), punkContextFrame, dwFlags, ppunkTargetFrame);
     return E_NOTIMPL;
 }

@@ -1570,7 +1570,7 @@ static HRESULT WINAPI TargetFramePriv2_NavigateHack(ITargetFramePriv2 *iface, DW
         IBindStatusCallback *pibsc, LPCWSTR pszTargetName, LPCWSTR pszUrl, LPCWSTR pszLocation)
 {
     HlinkFrame *This = impl_from_ITargetFramePriv2(iface);
-    FIXME("(%p)->(%x %p %p %s %s %s)\n", This, grfHLNF, pbc, pibsc, debugstr_w(pszTargetName),
+    FIXME("(%p)->(%lx %p %p %s %s %s)\n", This, grfHLNF, pbc, pibsc, debugstr_w(pszTargetName),
           debugstr_w(pszUrl), debugstr_w(pszLocation));
     return E_NOTIMPL;
 }
@@ -1578,7 +1578,7 @@ static HRESULT WINAPI TargetFramePriv2_NavigateHack(ITargetFramePriv2 *iface, DW
 static HRESULT WINAPI TargetFramePriv2_FindBrowserByIndex(ITargetFramePriv2 *iface, DWORD dwID, IUnknown **ppunkBrowser)
 {
     HlinkFrame *This = impl_from_ITargetFramePriv2(iface);
-    FIXME("(%p)->(%d %p)\n", This, dwID, ppunkBrowser);
+    FIXME("(%p)->(%ld %p)\n", This, dwID, ppunkBrowser);
     return E_NOTIMPL;
 }

@@ -1589,7 +1589,7 @@ static HRESULT WINAPI TargetFramePriv2_AggregatedNavigation2(ITargetFramePriv2 *
     IMoniker *mon;
     HRESULT hres;

-    TRACE("(%p)->(%x %p %p %s %p %s)\n", This, grfHLNF, pbc, pibsc, debugstr_w(pszTargetName),
+    TRACE("(%p)->(%lx %p %p %s %p %s)\n", This, grfHLNF, pbc, pibsc, debugstr_w(pszTargetName),
           pUri, debugstr_w(pszLocation));

/*
diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c
index b8377b35d43..36bca2a9baa 100644
--- a/dlls/ieframe/oleobject.c
+++ b/dlls/ieframe/oleobject.c
@@ -155,7 +155,7 @@ static HRESULT activate_inplace(WebBrowser *This, IOleClientSite *active_site)

hres = IOleInPlaceSiteEx_CanInPlaceActivate(This->inplace);
     if(hres != S_OK) {
-        WARN("CanInPlaceActivate returned: %08x\n", hres);
+        WARN("CanInPlaceActivate returned: %08lx\n", hres);
         IOleInPlaceSiteEx_Release(This->inplace);
         This->inplace = NULL;
         return E_FAIL;
@@ -361,7 +361,7 @@ static ULONG WINAPI EnumOLEVERB_AddRef(IEnumOLEVERB *iface)
     EnumOLEVERB *This = impl_from_IEnumOLEVERB(iface);
     LONG ref = InterlockedIncrement(&This->ref);

-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);

return ref;
 }
@@ -371,7 +371,7 @@ static ULONG WINAPI EnumOLEVERB_Release(IEnumOLEVERB *iface)
     EnumOLEVERB *This = impl_from_IEnumOLEVERB(iface);
     LONG ref = InterlockedDecrement(&This->ref);

-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);

if(!ref)
         heap_free(This);
@@ -386,7 +386,7 @@ static HRESULT WINAPI EnumOLEVERB_Next(IEnumOLEVERB *iface, ULONG celt, OLEVERB
     static const OLEVERB verbs[] =
         {{OLEIVERB_PRIMARY},{OLEIVERB_INPLACEACTIVATE},{OLEIVERB_UIACTIVATE},{OLEIVERB_SHOW},{OLEIVERB_HIDE}};

-    TRACE("(%p)->(%u %p %p)\n", This, celt, rgelt, pceltFetched);
+    TRACE("(%p)->(%lu %p %p)\n", This, celt, rgelt, pceltFetched);

/* There are a few problems with this implementation, but that's how it seems to work in native. See tests. */
     if(pceltFetched)
@@ -403,7 +403,7 @@ static HRESULT WINAPI EnumOLEVERB_Next(IEnumOLEVERB *iface, ULONG celt, OLEVERB
 static HRESULT WINAPI EnumOLEVERB_Skip(IEnumOLEVERB *iface, ULONG celt)
 {
     EnumOLEVERB *This = impl_from_IEnumOLEVERB(iface);
-    TRACE("(%p)->(%u)\n", This, celt);
+    TRACE("(%p)->(%lu)\n", This, celt);
     return S_OK;
 }

@@ -613,10 +613,10 @@ static HRESULT WINAPI OleObject_Close(IOleObject *iface, DWORD dwSaveOption)
     IOleClientSite *client;
     HRESULT hres;

-    TRACE("(%p)->(%d)\n", This, dwSaveOption);
+    TRACE("(%p)->(%ld)\n", This, dwSaveOption);

if(dwSaveOption != OLECLOSE_NOSAVE) {
-        FIXME("unimplemented flag: %x\n", dwSaveOption);
+        FIXME("unimplemented flag: %lx\n", dwSaveOption);
         return E_NOTIMPL;
     }

@@ -638,7 +638,7 @@ static HRESULT WINAPI OleObject_Close(IOleObject *iface, DWORD dwSaveOption)
 static HRESULT WINAPI OleObject_SetMoniker(IOleObject *iface, DWORD dwWhichMoniker, IMoniker* pmk)
 {
     WebBrowser *This = impl_from_IOleObject(iface);
-    FIXME("(%p)->(%d, %p)\n", This, dwWhichMoniker, pmk);
+    FIXME("(%p)->(%ld, %p)\n", This, dwWhichMoniker, pmk);
     return E_NOTIMPL;
 }

@@ -646,7 +646,7 @@ static HRESULT WINAPI OleObject_GetMoniker(IOleObject *iface, DWORD dwAssign,
         DWORD dwWhichMoniker, LPMONIKER *ppmk)
 {
     WebBrowser *This = impl_from_IOleObject(iface);
-    FIXME("(%p)->(%d, %d, %p)\n", This, dwAssign, dwWhichMoniker, ppmk);
+    FIXME("(%p)->(%ld, %ld, %p)\n", This, dwAssign, dwWhichMoniker, ppmk);
     return E_NOTIMPL;
 }

@@ -654,7 +654,7 @@ static HRESULT WINAPI OleObject_InitFromData(IOleObject *iface, LPDATAOBJECT pDa
         BOOL fCreation, DWORD dwReserved)
 {
     WebBrowser *This = impl_from_IOleObject(iface);
-    FIXME("(%p)->(%p, %d, %d)\n", This, pDataObject, fCreation, dwReserved);
+    FIXME("(%p)->(%p, %d, %ld)\n", This, pDataObject, fCreation, dwReserved);
     return E_NOTIMPL;
 }

@@ -662,7 +662,7 @@ static HRESULT WINAPI OleObject_GetClipboardData(IOleObject *iface, DWORD dwRese
         LPDATAOBJECT *ppDataObject)
 {
     WebBrowser *This = impl_from_IOleObject(iface);
-    FIXME("(%p)->(%d, %p)\n", This, dwReserved, ppDataObject);
+    FIXME("(%p)->(%ld, %p)\n", This, dwReserved, ppDataObject);
     return E_NOTIMPL;
 }

@@ -671,7 +671,7 @@ static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, struct tag
 {
     WebBrowser *This = impl_from_IOleObject(iface);

-    TRACE("(%p)->(%d %p %p %d %p %s)\n", This, iVerb, lpmsg, pActiveSite, lindex, hwndParent,
+    TRACE("(%p)->(%ld %p %p %ld %p %s)\n", This, iVerb, lpmsg, pActiveSite, lindex, hwndParent,
           wine_dbgstr_rect(lprcPosRect));

/* restore closed client site if we have one */
@@ -704,7 +704,7 @@ static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, struct tag
             ShowWindow(This->shell_embedding_hwnd, SW_HIDE);
         return S_OK;
     default:
-        FIXME("stub for %d\n", iVerb);
+        FIXME("stub for %ld\n", iVerb);
         break;
     }

@@ -758,7 +758,7 @@ static HRESULT WINAPI OleObject_GetUserType(IOleObject *iface, DWORD dwFormOfTyp
         LPOLESTR* pszUserType)
 {
     WebBrowser *This = impl_from_IOleObject(iface);
-    TRACE("(%p, %d, %p)\n", This, dwFormOfType, pszUserType);
+    TRACE("(%p, %ld, %p)\n", This, dwFormOfType, pszUserType);
     return OleRegGetUserType(&CLSID_WebBrowser, dwFormOfType, pszUserType);
 }

@@ -766,7 +766,7 @@ static HRESULT WINAPI OleObject_SetExtent(IOleObject *iface, DWORD dwDrawAspect,
 {
     WebBrowser *This = impl_from_IOleObject(iface);

-    TRACE("(%p)->(%x %p)\n", This, dwDrawAspect, psizel);
+    TRACE("(%p)->(%lx %p)\n", This, dwDrawAspect, psizel);

/* Tests show that dwDrawAspect is ignored */
     This->extent = *psizel;
@@ -777,7 +777,7 @@ static HRESULT WINAPI OleObject_GetExtent(IOleObject *iface, DWORD dwDrawAspect,
 {
     WebBrowser *This = impl_from_IOleObject(iface);

-    TRACE("(%p)->(%x, %p)\n", This, dwDrawAspect, psizel);
+    TRACE("(%p)->(%lx, %p)\n", This, dwDrawAspect, psizel);

/* Tests show that dwDrawAspect is ignored */
     *psizel = This->extent;
@@ -813,7 +813,7 @@ static HRESULT WINAPI OleObject_Unadvise(IOleObject *iface, DWORD dwConnection)
 {
     WebBrowser *This = impl_from_IOleObject(iface);

-    TRACE("(%p)->(%d)\n", This, dwConnection);
+    TRACE("(%p)->(%ld)\n", This, dwConnection);

if(!This->advise_holder)
         return OLE_E_NOCONNECTION;
@@ -835,7 +835,7 @@ static HRESULT WINAPI OleObject_GetMiscStatus(IOleObject *iface, DWORD dwAspect,
 {
     WebBrowser *This = impl_from_IOleObject(iface);

-    TRACE("(%p)->(%x, %p)\n", This, dwAspect, pdwStatus);
+    TRACE("(%p)->(%lx, %p)\n", This, dwAspect, pdwStatus);

*pdwStatus = OLEMISC_SETCLIENTSITEFIRST|OLEMISC_ACTIVATEWHENVISIBLE|OLEMISC_INSIDEOUT
         |OLEMISC_CANTLINKINSIDE|OLEMISC_RECOMPOSEONRESIZE;
@@ -1036,7 +1036,7 @@ static HRESULT WINAPI OleControl_OnAmbientPropertyChange(IOleControl *iface, DIS
 {
     WebBrowser *This = impl_from_IOleControl(iface);

-    TRACE("(%p)->(%d)\n", This, dispID);
+    TRACE("(%p)->(%ld)\n", This, dispID);

switch(dispID) {
     case DISPID_UNKNOWN:
@@ -1052,7 +1052,7 @@ static HRESULT WINAPI OleControl_OnAmbientPropertyChange(IOleControl *iface, DIS
         return on_silent_change(This);
     }

-    FIXME("Unknown dispID %d\n", dispID);
+    FIXME("Unknown dispID %ld\n", dispID);
     return E_NOTIMPL;
 }

@@ -1212,7 +1212,7 @@ static HRESULT WINAPI WBOleCommandTarget_QueryStatus(IOleCommandTarget *iface,
     IOleCommandTarget *cmdtrg;
     HRESULT hres;

-    TRACE("(%p)->(%s %u %p %p)\n", This, debugstr_guid(pguidCmdGroup), cCmds, prgCmds,
+    TRACE("(%p)->(%s %lu %p %p)\n", This, debugstr_guid(pguidCmdGroup), cCmds, prgCmds,
           pCmdText);

if(!This->doc_host.document)
@@ -1236,7 +1236,7 @@ static HRESULT WINAPI WBOleCommandTarget_Exec(IOleCommandTarget *iface,
         VARIANT *pvaOut)
 {
     WebBrowser *This = impl_from_IOleCommandTarget(iface);
-    FIXME("(%p)->(%s %d %d %s %p)\n", This, debugstr_guid(pguidCmdGroup), nCmdID,
+    FIXME("(%p)->(%s %ld %ld %s %p)\n", This, debugstr_guid(pguidCmdGroup), nCmdID,
           nCmdexecopt, debugstr_variant(pvaIn), pvaOut);
     return E_NOTIMPL;
 }
diff --git a/dlls/ieframe/persist.c b/dlls/ieframe/persist.c
index a0a7c94fbe8..407a99c4814 100644
--- a/dlls/ieframe/persist.c
+++ b/dlls/ieframe/persist.c
@@ -167,7 +167,7 @@ static HRESULT WINAPI PersistMemory_InitNew(IPersistMemory *iface)
 static HRESULT WINAPI PersistMemory_Load(IPersistMemory *iface, LPVOID pMem, ULONG cbSize)
 {
     WebBrowser *This = impl_from_IPersistMemory(iface);
-    FIXME("(%p)->(%p %x)\n", This, pMem, cbSize);
+    FIXME("(%p)->(%p %lx)\n", This, pMem, cbSize);
     return S_OK;
 }

@@ -175,7 +175,7 @@ static HRESULT WINAPI PersistMemory_Save(IPersistMemory *iface, LPVOID pMem,
         BOOL fClearDirty, ULONG cbSize)
 {
     WebBrowser *This = impl_from_IPersistMemory(iface);
-    FIXME("(%p)->(%p %x %x)\n", This, pMem, fClearDirty, cbSize);
+    FIXME("(%p)->(%p %x %lx)\n", This, pMem, fClearDirty, cbSize);
     return E_NOTIMPL;
 }

diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c
index 375f9caa1b1..06f8df9b511 100644
--- a/dlls/ieframe/shellbrowser.c
+++ b/dlls/ieframe/shellbrowser.c
@@ -69,7 +69,7 @@ static ULONG WINAPI ShellBrowser_AddRef(
     ShellBrowser *This = impl_from_IShellBrowser(iface);
     LONG ref = InterlockedIncrement(&This->ref);

-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);

return ref;
 }
@@ -79,7 +79,7 @@ static ULONG WINAPI ShellBrowser_Release(IShellBrowser* iface)
     ShellBrowser *This = impl_from_IShellBrowser(iface);
     LONG ref = InterlockedDecrement(&This->ref);

-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);

if(!ref) {
         assert(!This->doc_host);
@@ -181,7 +181,7 @@ static HRESULT WINAPI ShellBrowser_GetViewStateStream(
         IStream **ppStrm)
 {
     ShellBrowser *This = impl_from_IShellBrowser(iface);
-    FIXME("%p %x %p\n", This, grfMode, ppStrm);
+    FIXME("%p %lx %p\n", This, grfMode, ppStrm);
     return E_NOTIMPL;
 }

@@ -312,7 +312,7 @@ static HRESULT WINAPI BrowserService_GetTitle(
         DWORD cchName)
 {
     ShellBrowser *This = impl_from_IBrowserService(iface);
-    FIXME("%p %p %p %d\n", This, psv, pszName, cchName);
+    FIXME("%p %p %p %ld\n", This, psv, pszName, cchName);
     return E_NOTIMPL;
 }

@@ -382,7 +382,7 @@ static HRESULT WINAPI BrowserService_DisplayParseError(
         LPCWSTR pwszPath)
 {
     ShellBrowser *This = impl_from_IBrowserService(iface);
-    FIXME("%p %x %s\n", This, hres, debugstr_w(pwszPath));
+    FIXME("%p %lx %s\n", This, hres, debugstr_w(pwszPath));
     return E_NOTIMPL;
 }

@@ -392,7 +392,7 @@ static HRESULT WINAPI BrowserService_NavigateToPidl(
         DWORD grfHLNF)
 {
     ShellBrowser *This = impl_from_IBrowserService(iface);
-    FIXME("%p %p %d\n", This, pidl, grfHLNF);
+    FIXME("%p %p %ld\n", This, pidl, grfHLNF);
     return E_NOTIMPL;
 }

@@ -447,7 +447,7 @@ static HRESULT WINAPI BrowserService_SetFlags(
         DWORD dwFlagMask)
 {
     ShellBrowser *This = impl_from_IBrowserService(iface);
-    FIXME("%p %x %x\n", This, dwFlags, dwFlagMask);
+    FIXME("%p %lx %lx\n", This, dwFlags, dwFlagMask);
     return E_NOTIMPL;
 }

@@ -500,7 +500,7 @@ static HRESULT WINAPI BrowserService_GetBrowserByIndex(
         IUnknown **ppunk)
 {
     ShellBrowser *This = impl_from_IBrowserService(iface);
-    FIXME("%p %x %p\n", This, dwID, ppunk);
+    FIXME("%p %lx %p\n", This, dwID, ppunk);
     return E_NOTIMPL;
 }

@@ -660,7 +660,7 @@ static HRESULT WINAPI DocObjectService_FireBeforeNavigate2(
     WCHAR file_path[MAX_PATH];
     DWORD file_path_len = ARRAY_SIZE(file_path);

-    TRACE("%p %p %s %x %s %p %d %s %d %p\n", This, pDispatch, debugstr_w(lpszUrl),
+    TRACE("%p %p %s %lx %s %p %ld %s %d %p\n", This, pDispatch, debugstr_w(lpszUrl),
             dwFlags, debugstr_w(lpszFrameName), pPostData, cbPostData,
             debugstr_w(lpszHeaders), fPlayNavSound, pfCancel);

@@ -746,7 +746,7 @@ static HRESULT WINAPI DocObjectService_FireNavigateComplete2(
     BSTR url;
     HRESULT hres;

-    TRACE("%p %p %x\n", This, pHTMLWindow2, dwFlags);
+    TRACE("%p %p %lx\n", This, pHTMLWindow2, dwFlags);

update_navigation_commands(This->doc_host);

@@ -819,7 +819,7 @@ static HRESULT WINAPI DocObjectService_FireDocumentComplete(
     BSTR url;
     HRESULT hres;

-    TRACE("%p %p %x\n", This, pHTMLWindow, dwFlags);
+    TRACE("%p %p %lx\n", This, pHTMLWindow, dwFlags);

hres = IHTMLWindow2_QueryInterface(pHTMLWindow, &IID_IHTMLPrivateWindow, (void**)&priv_window);
     if(FAILED(hres))
@@ -991,7 +991,7 @@ static HRESULT WINAPI NewWindowManager_EvaluateNewWindow(INewWindowManager *ifac
         DWORD dwUserActionTime)
 {
     NewWindowManager *This = impl_from_INewWindowManager(iface);
-    FIXME("(%p)->(%s %s %s %s %x %x %d)\n", This, debugstr_w(pszUrl), debugstr_w(pszName), debugstr_w(pszUrlContext),
+    FIXME("(%p)->(%s %s %s %s %x %lx %ld)\n", This, debugstr_w(pszUrl), debugstr_w(pszName), debugstr_w(pszUrlContext),
           debugstr_w(pszFeatures), fReplace, dwFlags, dwUserActionTime);
     return S_OK;
 }
diff --git a/dlls/ieframe/shelluihelper.c b/dlls/ieframe/shelluihelper.c
index cc636f6bdbc..99f2ee332bc 100644
--- a/dlls/ieframe/shelluihelper.c
+++ b/dlls/ieframe/shelluihelper.c
@@ -63,7 +63,7 @@ static ULONG WINAPI ShellUIHelper2_AddRef(IShellUIHelper2 *iface)
     ShellUIHelper *This = impl_from_IShellUIHelper2(iface);
     LONG ref = InterlockedIncrement(&This->ref);

-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);

return ref;
 }
@@ -73,7 +73,7 @@ static ULONG WINAPI ShellUIHelper2_Release(IShellUIHelper2 *iface)
     ShellUIHelper *This = impl_from_IShellUIHelper2(iface);
     LONG ref = InterlockedDecrement(&This->ref);

-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);

if(!ref)
         heap_free(This);
@@ -94,7 +94,7 @@ static HRESULT WINAPI ShellUIHelper2_GetTypeInfoCount(IShellUIHelper2 *iface, UI
 static HRESULT WINAPI ShellUIHelper2_GetTypeInfo(IShellUIHelper2 *iface, UINT iTInfo, LCID lcid, LPTYPEINFO *ppTInfo)
 {
     ShellUIHelper *This = impl_from_IShellUIHelper2(iface);
-    FIXME("(%p)->(%d %d %p)\n", This, iTInfo, lcid, ppTInfo);
+    FIXME("(%p)->(%d %ld %p)\n", This, iTInfo, lcid, ppTInfo);
     return E_NOTIMPL;
 }

@@ -104,7 +104,7 @@ static HRESULT WINAPI ShellUIHelper2_GetIDsOfNames(IShellUIHelper2 *iface, REFII
     ShellUIHelper *This = impl_from_IShellUIHelper2(iface);
     unsigned i;

-    FIXME("(%p)->(%s %p %d %d %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
+    FIXME("(%p)->(%s %p %d %ld %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
     for(i = 0; i < cNames; i++)
         FIXME("%s\n", debugstr_w(rgszNames[i]));

@@ -116,7 +116,7 @@ static HRESULT WINAPI ShellUIHelper2_Invoke(IShellUIHelper2 *iface, DISPID dispI
         EXCEPINFO *pExepInfo, UINT *puArgErr)
 {
     ShellUIHelper *This = impl_from_IShellUIHelper2(iface);
-    FIXME("(%p)->(%d %s %d %08x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
+    FIXME("(%p)->(%ld %s %ld %08x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
           lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr);
     return E_NOTIMPL;
 }
diff --git a/dlls/ieframe/urlhist.c b/dlls/ieframe/urlhist.c
index d963d9517c2..afe94ff4de7 100644
--- a/dlls/ieframe/urlhist.c
+++ b/dlls/ieframe/urlhist.c
@@ -62,21 +62,21 @@ static ULONG WINAPI UrlHistoryStg_Release(IUrlHistoryStg2 *iface)
 static HRESULT WINAPI UrlHistoryStg_AddUrl(IUrlHistoryStg2 *iface, LPCOLESTR lpcsUrl,
         LPCOLESTR pocsTitle, DWORD dwFlags)
 {
-    FIXME("(%s %s %08x)\n", debugstr_w(lpcsUrl), debugstr_w(pocsTitle), dwFlags);
+    FIXME("(%s %s %08lx)\n", debugstr_w(lpcsUrl), debugstr_w(pocsTitle), dwFlags);
     return E_NOTIMPL;
 }

static HRESULT WINAPI UrlHistoryStg_DeleteUrl(IUrlHistoryStg2 *iface, LPCOLESTR lpcsUrl,
         DWORD dwFlags)
 {
-    FIXME("(%s %08x)\n", debugstr_w(lpcsUrl), dwFlags);
+    FIXME("(%s %08lx)\n", debugstr_w(lpcsUrl), dwFlags);
     return E_NOTIMPL;
 }

static HRESULT WINAPI UrlHistoryStg_QueryUrl(IUrlHistoryStg2 *iface, LPCOLESTR lpcsUrl,
         DWORD dwFlags, LPSTATURL lpSTATURL)
 {
-    FIXME("(%s %08x %p)\n", debugstr_w(lpcsUrl), dwFlags, lpSTATURL);
+    FIXME("(%s %08lx %p)\n", debugstr_w(lpcsUrl), dwFlags, lpSTATURL);
     return E_NOTIMPL;
 }

@@ -97,7 +97,7 @@ static HRESULT WINAPI UrlHistoryStg_AddUrlAndNotify(IUrlHistoryStg2 *iface, LPCO
         LPCOLESTR pocsTitle, DWORD dwFlags, BOOL fWriteHistory, IOleCommandTarget *poctNotify,
         IUnknown *punkISFolder)
 {
-    FIXME("(%s %s %08x %x %p %p)\n", debugstr_w(pocsUrl), debugstr_w(pocsTitle),
+    FIXME("(%s %s %08lx %x %p %p)\n", debugstr_w(pocsUrl), debugstr_w(pocsTitle),
           dwFlags, fWriteHistory, poctNotify, punkISFolder);
     return E_NOTIMPL;
 }
diff --git a/dlls/ieframe/view.c b/dlls/ieframe/view.c
index d307bb5a003..ea6742f3951 100644
--- a/dlls/ieframe/view.c
+++ b/dlls/ieframe/view.c
@@ -57,7 +57,7 @@ static HRESULT WINAPI ViewObject_Draw(IViewObject2 *iface, DWORD dwDrawAspect,
         ULONG_PTR dwContinue)
 {
     WebBrowser *This = impl_from_IViewObject2(iface);
-    FIXME("(%p)->(%d %d %p %p %p %p %p %p %p %08lx)\n", This, dwDrawAspect, lindex,
+    FIXME("(%p)->(%ld %ld %p %p %p %p %p %p %p %08Ix)\n", This, dwDrawAspect, lindex,
             pvAspect, ptd, hdcTargetDev, hdcDraw, lprcBounds, lprcWBounds, pfnContinue,
             dwContinue);
     return S_OK;
@@ -68,7 +68,7 @@ static HRESULT WINAPI ViewObject_GetColorSet(IViewObject2 *iface, DWORD dwAspect
         LOGPALETTE **ppColorSet)
 {
     WebBrowser *This = impl_from_IViewObject2(iface);
-    FIXME("(%p)->(%d %d %p %p %p %p)\n", This, dwAspect, lindex, pvAspect, ptd,
+    FIXME("(%p)->(%ld %ld %p %p %p %p)\n", This, dwAspect, lindex, pvAspect, ptd,
             hicTargetDev, ppColorSet);
     return E_NOTIMPL;
 }
@@ -77,14 +77,14 @@ static HRESULT WINAPI ViewObject_Freeze(IViewObject2 *iface, DWORD dwDrawAspect,
                                         void *pvAspect, DWORD *pdwFreeze)
 {
     WebBrowser *This = impl_from_IViewObject2(iface);
-    FIXME("(%p)->(%d %d %p %p)\n", This, dwDrawAspect, lindex, pvAspect, pdwFreeze);
+    FIXME("(%p)->(%ld %ld %p %p)\n", This, dwDrawAspect, lindex, pvAspect, pdwFreeze);
     return E_NOTIMPL;
 }

static HRESULT WINAPI ViewObject_Unfreeze(IViewObject2 *iface, DWORD dwFreeze)
 {
     WebBrowser *This = impl_from_IViewObject2(iface);
-    FIXME("(%p)->(%d)\n", This, dwFreeze);
+    FIXME("(%p)->(%ld)\n", This, dwFreeze);
     return E_NOTIMPL;
 }

@@ -93,7 +93,7 @@ static HRESULT WINAPI ViewObject_SetAdvise(IViewObject2 *iface, DWORD aspects, D
 {
     WebBrowser *This = impl_from_IViewObject2(iface);

-    TRACE("(%p)->(%d %08x %p)\n", This, aspects, advf, pAdvSink);
+    TRACE("(%p)->(%ld %08lx %p)\n", This, aspects, advf, pAdvSink);

if (aspects || advf) FIXME("aspects and/or flags not supported yet\n");

@@ -128,7 +128,7 @@ static HRESULT WINAPI ViewObject_GetExtent(IViewObject2 *iface, DWORD dwAspect,
         DVTARGETDEVICE *ptd, LPSIZEL lpsizel)
 {
     WebBrowser *This = impl_from_IViewObject2(iface);
-    FIXME("(%p)->(%d %d %p %p)\n", This, dwAspect, lindex, ptd, lpsizel);
+    FIXME("(%p)->(%ld %ld %p %p)\n", This, dwAspect, lindex, ptd, lpsizel);
     return E_NOTIMPL;
 }

diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c
index 26ce666b4ba..6aa61e265c6 100644
--- a/dlls/ieframe/webbrowser.c
+++ b/dlls/ieframe/webbrowser.c
@@ -155,7 +155,7 @@ static ULONG WINAPI WebBrowser_AddRef(IUnknown *iface)
 {
     WebBrowser *This = impl_from_IUnknown(iface);
     LONG ref = InterlockedIncrement(&This->ref);
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
     return ref;
 }

@@ -164,7 +164,7 @@ static ULONG WINAPI WebBrowser_Release(IUnknown *iface)
     WebBrowser *This = impl_from_IUnknown(iface);
     LONG ref = InterlockedDecrement(&This->ref);

-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);

if(!ref) {
         if(This->sink)
@@ -238,7 +238,7 @@ static HRESULT WINAPI WebBrowser_GetTypeInfo(IWebBrowser2 *iface, UINT iTInfo, L
     ITypeInfo *typeinfo;
     HRESULT hres;

-    TRACE("(%p)->(%d %d %p)\n", This, iTInfo, lcid, ppTInfo);
+    TRACE("(%p)->(%d %ld %p)\n", This, iTInfo, lcid, ppTInfo);

hres = get_typeinfo(IWebBrowser2_tid, &typeinfo);
     if(FAILED(hres))
@@ -257,7 +257,7 @@ static HRESULT WINAPI WebBrowser_GetIDsOfNames(IWebBrowser2 *iface, REFIID riid,
     ITypeInfo *typeinfo;
     HRESULT hres;

-    TRACE("(%p)->(%s %p %d %d %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
+    TRACE("(%p)->(%s %p %d %ld %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
           lcid, rgDispId);

hres = get_typeinfo(IWebBrowser2_tid, &typeinfo);
@@ -276,7 +276,7 @@ static HRESULT WINAPI WebBrowser_Invoke(IWebBrowser2 *iface, DISPID dispIdMember
     ITypeInfo *typeinfo;
     HRESULT hres;

-    TRACE("(%p)->(%d %s %d %08x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
+    TRACE("(%p)->(%ld %s %ld %08x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
             lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr);

hres = get_typeinfo(IWebBrowser2_tid, &typeinfo);
@@ -439,7 +439,7 @@ static HRESULT WINAPI WebBrowser_put_Left(IWebBrowser2 *iface, LONG Left)
     WebBrowser *This = impl_from_IWebBrowser2(iface);
     RECT rect;

-    TRACE("(%p)->(%d)\n", This, Left);
+    TRACE("(%p)->(%ld)\n", This, Left);

if(!This->inplace)
         return E_UNEXPECTED;
@@ -467,7 +467,7 @@ static HRESULT WINAPI WebBrowser_put_Top(IWebBrowser2 *iface, LONG Top)
     WebBrowser *This = impl_from_IWebBrowser2(iface);
     RECT rect;

-    TRACE("(%p)->(%d)\n", This, Top);
+    TRACE("(%p)->(%ld)\n", This, Top);

if(!This->inplace)
         return E_UNEXPECTED;
@@ -495,7 +495,7 @@ static HRESULT WINAPI WebBrowser_put_Width(IWebBrowser2 *iface, LONG Width)
     WebBrowser *This = impl_from_IWebBrowser2(iface);
     RECT rect;

-    TRACE("(%p)->(%d)\n", This, Width);
+    TRACE("(%p)->(%ld)\n", This, Width);

if(!This->inplace)
         return E_UNEXPECTED;
@@ -523,7 +523,7 @@ static HRESULT WINAPI WebBrowser_put_Height(IWebBrowser2 *iface, LONG Height)
     WebBrowser *This = impl_from_IWebBrowser2(iface);
     RECT rect;

-    TRACE("(%p)->(%d)\n", This, Height);
+    TRACE("(%p)->(%ld)\n", This, Height);

if(!This->inplace)
         return E_UNEXPECTED;

[PATCH 03/23] dlls/ifsmgr.vxd: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech

---
 dlls/ifsmgr.vxd/Makefile.in |    1 -
 dlls/ifsmgr.vxd/ifsmgr.c    |    4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/ifsmgr.vxd/Makefile.in b/dlls/ifsmgr.vxd/Makefile.in
index 302778577e2..65c6be21036 100644
--- a/dlls/ifsmgr.vxd/Makefile.in
+++ b/dlls/ifsmgr.vxd/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = ifsmgr.vxd
 IMPORTS   = kernel

diff --git a/dlls/ifsmgr.vxd/ifsmgr.c b/dlls/ifsmgr.vxd/ifsmgr.c
index ab232ec6c23..22800b95c05 100644
--- a/dlls/ifsmgr.vxd/ifsmgr.c
+++ b/dlls/ifsmgr.vxd/ifsmgr.c
@@ -107,7 +107,7 @@ BOOL WINAPI IFSMGR_DeviceIoControl(DWORD dwIoControlCode, LPVOID lpvInBuffer, DW
                                   LPDWORD lpcbBytesReturned,
                                   LPOVERLAPPED lpOverlapped)
 {
-    TRACE("(%d,%p,%d,%p,%d,%p,%p): stub\n",
+    TRACE("(%ld,%p,%ld,%p,%ld,%p,%p): stub\n",
           dwIoControlCode, lpvInBuffer,cbInBuffer, lpvOutBuffer,cbOutBuffer,
           lpcbBytesReturned, lpOverlapped);

@@ -146,7 +146,7 @@ BOOL WINAPI IFSMGR_DeviceIoControl(DWORD dwIoControlCode, LPVOID lpvInBuffer, DW
         FIXME( "Control 'IFS_IOCTL_GET_NETPRO_NAME_A' not implemented\n");
         return FALSE;
     default:
-        FIXME( "Control %d not implemented\n", dwIoControlCode);
+        FIXME( "Control %ld not implemented\n", dwIoControlCode);
         return FALSE;
     }
 }

[PATCH 04/23] dlls/imaadp32.acm: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech

---
 dlls/imaadp32.acm/Makefile.in |    1 -
 dlls/imaadp32.acm/imaadp32.c  |   12 ++++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/dlls/imaadp32.acm/Makefile.in b/dlls/imaadp32.acm/Makefile.in
index e01f5494653..ff982fd138e 100644
--- a/dlls/imaadp32.acm/Makefile.in
+++ b/dlls/imaadp32.acm/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = imaadp32.acm
 IMPORTS   = winmm user32

diff --git a/dlls/imaadp32.acm/imaadp32.c b/dlls/imaadp32.acm/imaadp32.c
index b6d70dcbe2f..0b5e6a83ae6 100644
--- a/dlls/imaadp32.acm/imaadp32.c
+++ b/dlls/imaadp32.acm/imaadp32.c
@@ -569,7 +569,7 @@ static	LRESULT	ADPCM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery)
    }
    break;
     default:
-	WARN("Unsupported query %08x\n", dwQuery);
+	WARN("Unsupported query %08lx\n", dwQuery);
    return MMSYSERR_NOTSUPPORTED;
     }

@@ -628,12 +628,12 @@ static	LRESULT	ADPCM_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery)
        init_wfx_ima_adpcm((IMAADPCMWAVEFORMAT *)afd->pwfx);
        break;
    default:
-            WARN("Unsupported tag %08x\n", afd->dwFormatTag);
+            WARN("Unsupported tag %08lx\n", afd->dwFormatTag);
        return MMSYSERR_INVALPARAM;
    }
    break;
     default:
-	WARN("Unsupported query %08x\n", dwQuery);
+	WARN("Unsupported query %08lx\n", dwQuery);
    return MMSYSERR_NOTSUPPORTED;
     }
     afd->fdwSupport = ACMDRIVERDETAILS_SUPPORTF_CODEC;
@@ -877,7 +877,7 @@ static	LRESULT ADPCM_StreamSize(const ACMDRVSTREAMINSTANCE *adsi, PACMDRVSTREAMS
    }
    break;
     default:
-	WARN("Unsupported query %08x\n", adss->fdwSize);
+	WARN("Unsupported query %08lx\n", adss->fdwSize);
    return MMSYSERR_NOTSUPPORTED;
     }
     return MMSYSERR_NOERROR;
@@ -898,7 +898,7 @@ static LRESULT ADPCM_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEAD
      ACM_STREAMCONVERTF_END|
      ACM_STREAMCONVERTF_START))
     {
-	FIXME("Unsupported fdwConvert (%08x), ignoring it\n", adsh->fdwConvert);
+	FIXME("Unsupported fdwConvert (%08lx), ignoring it\n", adsh->fdwConvert);
     }
     /* ACM_STREAMCONVERTF_BLOCKALIGN
      *	currently all conversions are block aligned, so do nothing for this flag
@@ -923,7 +923,7 @@ static LRESULT ADPCM_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEAD
 LRESULT CALLBACK ADPCM_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg,
    				 LPARAM dwParam1, LPARAM dwParam2)
 {
-    TRACE("(%08lx %p %04x %08lx %08lx);\n",
+    TRACE("(%08Ix %p %04x %08Ix %08Ix);\n",
      dwDevID, hDriv, wMsg, dwParam1, dwParam2);

switch (wMsg)

[PATCH 05/23] dlls/imagehlp: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech

---
 dlls/imagehlp/Makefile.in |    2 +-
 dlls/imagehlp/access.c    |    6 +++---
 dlls/imagehlp/integrity.c |   18 +++++++++---------
 dlls/imagehlp/modify.c    |   18 +++++++++---------
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/dlls/imagehlp/Makefile.in b/dlls/imagehlp/Makefile.in
index 555bc47f879..e8958d9fc62 100644
--- a/dlls/imagehlp/Makefile.in
+++ b/dlls/imagehlp/Makefile.in
@@ -1,4 +1,4 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES -D_IMAGEHLP_SOURCE_
+EXTRADEFS = -D_IMAGEHLP_SOURCE_
 MODULE    = imagehlp.dll
 IMPORTLIB = imagehlp
 IMPORTS   = dbghelp
diff --git a/dlls/imagehlp/access.c b/dlls/imagehlp/access.c
index 29315f172ab..f0b5814dead 100644
--- a/dlls/imagehlp/access.c
+++ b/dlls/imagehlp/access.c
@@ -153,7 +153,7 @@ BOOL WINAPI MapAndLoad(PCSTR pszImageName, PCSTR pszDllPath, PLOADED_IMAGE pLoad
                         NULL, OPEN_EXISTING, 0, NULL);
     if (hFile == INVALID_HANDLE_VALUE)
     {
-        WARN("CreateFile: Error = %d\n", GetLastError());
+        WARN("CreateFile: Error = %ld\n", GetLastError());
         goto Error;
     }

@@ -162,7 +162,7 @@ BOOL WINAPI MapAndLoad(PCSTR pszImageName, PCSTR pszDllPath, PLOADED_IMAGE pLoad
                                       0, 0, NULL);
     if (!hFileMapping)
     {
-        WARN("CreateFileMapping: Error = %d\n", GetLastError());
+        WARN("CreateFileMapping: Error = %ld\n", GetLastError());
         goto Error;
     }

@@ -170,7 +170,7 @@ BOOL WINAPI MapAndLoad(PCSTR pszImageName, PCSTR pszDllPath, PLOADED_IMAGE pLoad
     CloseHandle(hFileMapping);
     if (!mapping)
     {
-        WARN("MapViewOfFile: Error = %d\n", GetLastError());
+        WARN("MapViewOfFile: Error = %ld\n", GetLastError());
         goto Error;
     }

diff --git a/dlls/imagehlp/integrity.c b/dlls/imagehlp/integrity.c
index d86ec11bd59..c2759c027f4 100644
--- a/dlls/imagehlp/integrity.c
+++ b/dlls/imagehlp/integrity.c
@@ -160,7 +160,7 @@ static BOOL IMAGEHLP_GetSecurityDirOffset( HANDLE handle,
     else
         return FALSE;

-    TRACE("ret = %d size = %x addr = %x\n", ret, sd->Size, sd->VirtualAddress);
+    TRACE("ret = %d size = %lx addr = %lx\n", ret, sd->Size, sd->VirtualAddress);

*pdwSize = sd->Size;
     *pdwOfs = sd->VirtualAddress;
@@ -208,7 +208,7 @@ static BOOL IMAGEHLP_SetSecurityDirOffset(HANDLE handle,
     sd->Size = dwSize;
     sd->VirtualAddress = dwOfs;

-    TRACE("size = %x addr = %x\n", sd->Size, sd->VirtualAddress);
+    TRACE("size = %lx addr = %lx\n", sd->Size, sd->VirtualAddress);

/* write the header back again */
     count = SetFilePointer(handle, pe_offset, NULL, FILE_BEGIN);
@@ -282,7 +282,7 @@ static BOOL IMAGEHLP_GetCertificateOffset( HANDLE handle, DWORD num,
     *pdwOfs = sd_VirtualAddr + offset;
     *pdwSize = len;

-    TRACE("len = %x addr = %x\n", len, sd_VirtualAddr + offset);
+    TRACE("len = %lx addr = %lx\n", len, sd_VirtualAddr + offset);

return TRUE;
 }
@@ -492,7 +492,7 @@ BOOL WINAPI ImageEnumerateCertificates(
     const size_t cert_hdr_size = sizeof hdr - sizeof hdr.bCertificate;
     BOOL r;

-    TRACE("%p %hd %p %p %d\n",
+    TRACE("%p %hd %p %p %ld\n",
            handle, TypeFilter, CertificateCount, Indices, IndexCount);

r = IMAGEHLP_GetSecurityDirOffset( handle, &sd_VirtualAddr, &size );
@@ -515,7 +515,7 @@ BOOL WINAPI ImageEnumerateCertificates(
         if( count != cert_hdr_size )
             return FALSE;

-        TRACE("Size = %08x  id = %08hx\n",
+        TRACE("Size = %08lx  id = %08hx\n",
                hdr.dwLength, hdr.wCertificateType );

/* check the certificate is not too big or too small */
@@ -556,7 +556,7 @@ BOOL WINAPI ImageGetCertificateData(
 {
     DWORD r, offset, ofs, size, count;

-    TRACE("%p %d %p %p\n", handle, Index, Certificate, RequiredLength);
+    TRACE("%p %ld %p %p\n", handle, Index, Certificate, RequiredLength);

if( !RequiredLength)
     {
@@ -607,7 +607,7 @@ BOOL WINAPI ImageGetCertificateHeader(
     DWORD r, offset, ofs, size, count;
     const size_t cert_hdr_size = sizeof *pCert - sizeof pCert->bCertificate;

-    TRACE("%p %d %p\n", handle, index, pCert);
+    TRACE("%p %ld %p\n", handle, index, pCert);

if( !IMAGEHLP_GetCertificateOffset( handle, index, &ofs, &size ) )
         return FALSE;
@@ -792,7 +792,7 @@ BOOL WINAPI ImageGetDigestStream(
     IMAGE_NT_HEADERS *nt_hdr;
     IMAGE_SECTION_HEADER *section_headers;

-    TRACE("(%p, %d, %p, %p)\n", FileHandle, DigestLevel, DigestFunction,
+    TRACE("(%p, %ld, %p, %p)\n", FileHandle, DigestLevel, DigestFunction,
         DigestHandle);

/* Get the file size */
@@ -891,7 +891,7 @@ BOOL WINAPI ImageRemoveCertificate(HANDLE FileHandle, DWORD Index)
     LPVOID cert_data;
     BOOL r;

-    TRACE("(%p, %d)\n", FileHandle, Index);
+    TRACE("(%p, %ld)\n", FileHandle, Index);

r = ImageEnumerateCertificates(FileHandle, CERT_SECTION_TYPE_ANY, &count, NULL, 0);

diff --git a/dlls/imagehlp/modify.c b/dlls/imagehlp/modify.c
index d740d221bfc..aa93ee63365 100644
--- a/dlls/imagehlp/modify.c
+++ b/dlls/imagehlp/modify.c
@@ -51,13 +51,13 @@ BOOL WINAPI BindImageEx(DWORD flags, const char *module, const char *dll_path,
     LOADED_IMAGE image;
     ULONG size;

-    TRACE("flags %#x, module %s, dll_path %s, symbol_path %s, cb %p.\n",
+    TRACE("flags %#lx, module %s, dll_path %s, symbol_path %s, cb %p.\n",
             flags, debugstr_a(module), debugstr_a(dll_path), debugstr_a(symbol_path), cb);

if (!(flags & BIND_NO_UPDATE))
         FIXME("Image modification is not implemented.\n");
     if (flags & ~BIND_NO_UPDATE)
-        FIXME("Ignoring flags %#x.\n", flags);
+        FIXME("Ignoring flags %#lx.\n", flags);

if (!MapAndLoad(module, dll_path, &image, TRUE, TRUE))
         return FALSE;
@@ -84,7 +84,7 @@ BOOL WINAPI BindImageEx(DWORD flags, const char *module, const char *dll_path,

if (!(dll_name = ImageRvaToVa(image.FileHeader, image.MappedAddress, import->Name, 0)))
         {
-            ERR("Failed to get VA for import name RVA %#x.\n", import->Name);
+            ERR("Failed to get VA for import name RVA %#lx.\n", import->Name);
             continue;
         }

@@ -99,7 +99,7 @@ BOOL WINAPI BindImageEx(DWORD flags, const char *module, const char *dll_path,
         thunk_rva = import->OriginalFirstThunk ? import->OriginalFirstThunk : import->FirstThunk;
         if (!(thunk = ImageRvaToVa(image.FileHeader, image.MappedAddress, thunk_rva, 0)))
         {
-            ERR("Failed to get VA for import thunk RVA %#x.\n", thunk_rva);
+            ERR("Failed to get VA for import thunk RVA %#lx.\n", thunk_rva);
             continue;
         }

@@ -117,7 +117,7 @@ BOOL WINAPI BindImageEx(DWORD flags, const char *module, const char *dll_path,

if (!(name = ImageRvaToVa(image.FileHeader, image.MappedAddress, thunk->u1.AddressOfData, 0)))
                 {
-                    ERR("Failed to get VA for name RVA %#x.\n", thunk->u1.AddressOfData);
+                    ERR("Failed to get VA for name RVA %#Ix.\n", thunk->u1.AddressOfData);
                     continue;
                 }

@@ -168,7 +168,7 @@ PIMAGE_NT_HEADERS WINAPI CheckSumMappedFile(
   DWORD CalcSum;
   DWORD HdrSum;

-  TRACE("(%p, %d, %p, %p)\n", BaseAddress, FileLength, HeaderSum, CheckSum);
+  TRACE("(%p, %ld, %p, %p)\n", BaseAddress, FileLength, HeaderSum, CheckSum);

CalcSum = CalcCheckSum(0, BaseAddress, (FileLength + 1) / sizeof(WORD));
   header = RtlImageNtHeader(BaseAddress);
@@ -349,7 +349,7 @@ BOOL WINAPI ReBaseImage(
   ULONG_PTR *NewImageBase, ULONG TimeStamp)
 {
   FIXME(
-    "(%s, %s, %d, %d, %d, %d, %p, %p, %p, %p, %d): stub\n",
+    "(%s, %s, %d, %d, %d, %ld, %p, %p, %p, %p, %ld): stub\n",
       debugstr_a(CurrentImageName),debugstr_a(SymbolPath), fReBase,
       fRebaseSysfileOk, fGoingDown, CheckImageSize, OldImageSize,
       OldImageBase, NewImageSize, NewImageBase, TimeStamp
@@ -387,7 +387,7 @@ BOOL WINAPI SplitSymbols(
   PSTR ImageName, PCSTR SymbolsPath,
   PSTR SymbolFilePath, ULONG Flags)
 {
-  FIXME("(%s, %s, %s, %d): stub\n",
+  FIXME("(%s, %s, %s, %ld): stub\n",
     debugstr_a(ImageName), debugstr_a(SymbolsPath),
     debugstr_a(SymbolFilePath), Flags
   );
@@ -417,7 +417,7 @@ BOOL WINAPI UpdateDebugInfoFileEx(
   PCSTR ImageFileName, PCSTR SymbolPath, PSTR DebugFilePath,
   PIMAGE_NT_HEADERS32 NtHeaders, DWORD OldChecksum)
 {
-  FIXME("(%s, %s, %s, %p, %d): stub\n",
+  FIXME("(%s, %s, %s, %p, %ld): stub\n",
     debugstr_a(ImageFileName), debugstr_a(SymbolPath),
     debugstr_a(DebugFilePath), NtHeaders, OldChecksum
   );

[PATCH 06/23] dlls/imm32: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech

---
 dlls/imm32/Makefile.in |    1 -
 dlls/imm32/imm.c       |   82 ++++++++++++++++++++++++------------------------
 2 files changed, 41 insertions(+), 42 deletions(-)

diff --git a/dlls/imm32/Makefile.in b/dlls/imm32/Makefile.in
index 71a092f179c..214b2b753d4 100644
--- a/dlls/imm32/Makefile.in
+++ b/dlls/imm32/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = imm32.dll
 IMPORTLIB = imm32
 IMPORTS   = user32 gdi32 advapi32
diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index fa2399487a4..bcb02b82c83 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -404,7 +404,7 @@ static IMMThreadData *IMM_GetThreadData(HWND hwnd, DWORD thread)
     data->IInitializeSpy_iface.lpVtbl = &InitializeSpyVtbl;
     data->threadID = thread;
     list_add_head(&ImmThreadDataList,&data->entry);
-    TRACE("Thread Data Created (%x)\n",thread);
+    TRACE("Thread Data Created (%lx)\n",thread);
     return data;
 }

@@ -560,7 +560,7 @@ static void IMM_FreeAllImmHkl(void)

BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved)
 {
-    TRACE("%p, %x, %p\n",hInstDLL,fdwReason,lpReserved);
+    TRACE("%p, %lx, %p\n",hInstDLL,fdwReason,lpReserved);
     switch (fdwReason)
     {
         case DLL_PROCESS_ATTACH:
@@ -795,7 +795,7 @@ static BOOL CALLBACK _ImmAssociateContextExEnumProc(HWND hwnd, LPARAM lParam)
  */
 BOOL WINAPI ImmAssociateContextEx(HWND hWnd, HIMC hIMC, DWORD dwFlags)
 {
-    TRACE("(%p, %p, 0x%x):\n", hWnd, hIMC, dwFlags);
+    TRACE("(%p, %p, 0x%lx):\n", hWnd, hIMC, dwFlags);

if (!hWnd)
         return FALSE;
@@ -820,7 +820,7 @@ BOOL WINAPI ImmAssociateContextEx(HWND hWnd, HIMC hIMC, DWORD dwFlags)
         EnumChildWindows(hWnd,_ImmAssociateContextExEnumProc,(LPARAM)hIMC);
         return TRUE;
     default:
-        FIXME("Unknown dwFlags 0x%x\n",dwFlags);
+        FIXME("Unknown dwFlags 0x%lx\n",dwFlags);
         return FALSE;
     }
 }
@@ -833,7 +833,7 @@ BOOL WINAPI ImmConfigureIMEA(
 {
     ImmHkl *immHkl = IMM_GetImmHkl(hKL);

-    TRACE("(%p, %p, %d, %p):\n", hKL, hWnd, dwMode, lpData);
+    TRACE("(%p, %p, %ld, %p):\n", hKL, hWnd, dwMode, lpData);

if (dwMode == IME_CONFIG_REGISTERWORD && !lpData)
         return FALSE;
@@ -868,7 +868,7 @@ BOOL WINAPI ImmConfigureIMEW(
 {
     ImmHkl *immHkl = IMM_GetImmHkl(hKL);

-    TRACE("(%p, %p, %d, %p):\n", hKL, hWnd, dwMode, lpData);
+    TRACE("(%p, %p, %ld, %p):\n", hKL, hWnd, dwMode, lpData);

if (dwMode == IME_CONFIG_REGISTERWORD && !lpData)
         return FALSE;
@@ -1057,7 +1057,7 @@ UINT WINAPI ImmEnumRegisterWordA(
   LPCSTR lpszRegister, LPVOID lpData)
 {
     ImmHkl *immHkl = IMM_GetImmHkl(hKL);
-    TRACE("(%p, %p, %s, %d, %s, %p):\n", hKL, lpfnEnumProc,
+    TRACE("(%p, %p, %s, %ld, %s, %p):\n", hKL, lpfnEnumProc,
         debugstr_a(lpszReading), dwStyle, debugstr_a(lpszRegister), lpData);
     if (immHkl->hIME && immHkl->pImeEnumRegisterWord)
     {
@@ -1092,7 +1092,7 @@ UINT WINAPI ImmEnumRegisterWordW(
   LPCWSTR lpszRegister, LPVOID lpData)
 {
     ImmHkl *immHkl = IMM_GetImmHkl(hKL);
-    TRACE("(%p, %p, %s, %d, %s, %p):\n", hKL, lpfnEnumProc,
+    TRACE("(%p, %p, %s, %ld, %s, %p):\n", hKL, lpfnEnumProc,
         debugstr_w(lpszReading), dwStyle, debugstr_w(lpszRegister), lpData);
     if (immHkl->hIME && immHkl->pImeEnumRegisterWord)
     {
@@ -1209,7 +1209,7 @@ DWORD WINAPI ImmGetCandidateListA(
     LPCANDIDATELIST candlist;
     DWORD ret = 0;

-    TRACE("%p, %d, %p, %d\n", hIMC, dwIndex, lpCandList, dwBufLen);
+    TRACE("%p, %ld, %p, %ld\n", hIMC, dwIndex, lpCandList, dwBufLen);

if (!data || !data->IMC.hCandInfo)
        return 0;
@@ -1312,7 +1312,7 @@ DWORD WINAPI ImmGetCandidateListW(
     LPCANDIDATELIST candlist;
     DWORD ret = 0;

-    TRACE("%p, %d, %p, %d\n", hIMC, dwIndex, lpCandList, dwBufLen);
+    TRACE("%p, %ld, %p, %ld\n", hIMC, dwIndex, lpCandList, dwBufLen);

if (!data || !data->IMC.hCandInfo)
        return 0;
@@ -1347,7 +1347,7 @@ BOOL WINAPI ImmGetCandidateWindow(
 {
     InputContextData *data = get_imc_data(hIMC);

-    TRACE("%p, %d, %p\n", hIMC, dwIndex, lpCandidate);
+    TRACE("%p, %ld, %p\n", hIMC, dwIndex, lpCandidate);

if (!data || !lpCandidate)
         return FALSE;
@@ -1587,7 +1587,7 @@ static LONG ImmGetCompositionStringT( HIMC hIMC, DWORD dwIndex, LPVOID lpBuf,
     LPCOMPOSITIONSTRING compstr;
     LPBYTE compdata;

-    TRACE("(%p, 0x%x, %p, %d)\n", hIMC, dwIndex, lpBuf, dwBufLen);
+    TRACE("(%p, 0x%lx, %p, %ld)\n", hIMC, dwIndex, lpBuf, dwBufLen);

if (!data)
        return FALSE;
@@ -1661,7 +1661,7 @@ static LONG ImmGetCompositionStringT( HIMC hIMC, DWORD dwIndex, LPVOID lpBuf,
         rc = CopyCompOffsetIMEtoClient(data, compstr->dwDeltaStart, compdata + compstr->dwCompStrOffset, unicode);
         break;
     default:
-        FIXME("Unhandled index 0x%x\n",dwIndex);
+        FIXME("Unhandled index 0x%lx\n",dwIndex);
         break;
     }

@@ -1748,7 +1748,7 @@ DWORD WINAPI ImmGetConversionListA(
   DWORD dwBufLen, UINT uFlag)
 {
     ImmHkl *immHkl = IMM_GetImmHkl(hKL);
-    TRACE("(%p, %p, %s, %p, %d, %d):\n", hKL, hIMC, debugstr_a(pSrc), lpDst,
+    TRACE("(%p, %p, %s, %p, %ld, %d):\n", hKL, hIMC, debugstr_a(pSrc), lpDst,
                 dwBufLen, uFlag);
     if (immHkl->hIME && immHkl->pImeConversionList)
     {
@@ -1786,7 +1786,7 @@ DWORD WINAPI ImmGetConversionListW(
   DWORD dwBufLen, UINT uFlag)
 {
     ImmHkl *immHkl = IMM_GetImmHkl(hKL);
-    TRACE("(%p, %p, %s, %p, %d, %d):\n", hKL, hIMC, debugstr_w(pSrc), lpDst,
+    TRACE("(%p, %p, %s, %p, %ld, %d):\n", hKL, hIMC, debugstr_w(pSrc), lpDst,
                 dwBufLen, uFlag);
     if (immHkl->hIME && immHkl->pImeConversionList)
     {
@@ -1870,7 +1870,7 @@ BOOL WINAPI __wine_register_window(HWND hwnd)
         return FALSE;
     }
     thread_data->windowRefs++;
-    TRACE("windowRefs=%u, hwndDefault=%p\n",
+    TRACE("windowRefs=%lu, hwndDefault=%p\n",
           thread_data->windowRefs, thread_data->hwndDefault);

/* Create default IME window */
@@ -1913,7 +1913,7 @@ void WINAPI __wine_unregister_window(HWND hwnd)
     if (!thread_data) return;

thread_data->windowRefs--;
-    TRACE("windowRefs=%u, hwndDefault=%p\n",
+    TRACE("windowRefs=%lu, hwndDefault=%p\n",
           thread_data->windowRefs, thread_data->hwndDefault);

/* Destroy default IME window */
@@ -1994,7 +1994,7 @@ UINT WINAPI ImmGetDescriptionW(HKL hKL, LPWSTR lpszDescription, UINT uBufLen)
 DWORD WINAPI ImmGetGuideLineA(
   HIMC hIMC, DWORD dwIndex, LPSTR lpBuf, DWORD dwBufLen)
 {
-  FIXME("(%p, %d, %s, %d): stub\n",
+  FIXME("(%p, %ld, %s, %ld): stub\n",
     hIMC, dwIndex, debugstr_a(lpBuf), dwBufLen
   );
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -2006,7 +2006,7 @@ DWORD WINAPI ImmGetGuideLineA(
  */
 DWORD WINAPI ImmGetGuideLineW(HIMC hIMC, DWORD dwIndex, LPWSTR lpBuf, DWORD dwBufLen)
 {
-  FIXME("(%p, %d, %s, %d): stub\n",
+  FIXME("(%p, %ld, %s, %ld): stub\n",
     hIMC, dwIndex, debugstr_w(lpBuf), dwBufLen
   );
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -2119,7 +2119,7 @@ DWORD WINAPI ImmGetProperty(HKL hKL, DWORD fdwIndex)
     DWORD rc = 0;
     ImmHkl *kbd;

-    TRACE("(%p, %d)\n", hKL, fdwIndex);
+    TRACE("(%p, %ld)\n", hKL, fdwIndex);
     kbd = IMM_GetImmHkl(hKL);

if (kbd && kbd->hIME)
@@ -2233,7 +2233,7 @@ UINT WINAPI ImmGetVirtualKey(HWND hWnd)
   case VER_PLATFORM_WIN32_NT:
       return 0;
   default:
-      FIXME("%d not supported\n",version.dwPlatformId);
+      FIXME("%ld not supported\n",version.dwPlatformId);
       return VK_PROCESSKEY;
   }
 }
@@ -2336,7 +2336,7 @@ BOOL WINAPI ImmIsIME(HKL hKL)
 BOOL WINAPI ImmIsUIMessageA(
   HWND hWndIME, UINT msg, WPARAM wParam, LPARAM lParam)
 {
-    TRACE("(%p, %x, %ld, %ld)\n", hWndIME, msg, wParam, lParam);
+    TRACE("(%p, %x, %Id, %Id)\n", hWndIME, msg, wParam, lParam);
     if ((msg >= WM_IME_STARTCOMPOSITION && msg <= WM_IME_KEYLAST) ||
             (msg == WM_IME_SETCONTEXT) ||
             (msg == WM_IME_NOTIFY) ||
@@ -2358,7 +2358,7 @@ BOOL WINAPI ImmIsUIMessageA(
 BOOL WINAPI ImmIsUIMessageW(
   HWND hWndIME, UINT msg, WPARAM wParam, LPARAM lParam)
 {
-    TRACE("(%p, %x, %ld, %ld)\n", hWndIME, msg, wParam, lParam);
+    TRACE("(%p, %x, %Id, %Id)\n", hWndIME, msg, wParam, lParam);
     if ((msg >= WM_IME_STARTCOMPOSITION && msg <= WM_IME_KEYLAST) ||
             (msg == WM_IME_SETCONTEXT) ||
             (msg == WM_IME_NOTIFY) ||
@@ -2382,7 +2382,7 @@ BOOL WINAPI ImmNotifyIME(
 {
     InputContextData *data = get_imc_data(hIMC);

-    TRACE("(%p, %d, %d, %d)\n",
+    TRACE("(%p, %ld, %ld, %ld)\n",
         hIMC, dwAction, dwIndex, dwValue);

if (hIMC == NULL)
@@ -2406,7 +2406,7 @@ BOOL WINAPI ImmRegisterWordA(
   HKL hKL, LPCSTR lpszReading, DWORD dwStyle, LPCSTR lpszRegister)
 {
     ImmHkl *immHkl = IMM_GetImmHkl(hKL);
-    TRACE("(%p, %s, %d, %s):\n", hKL, debugstr_a(lpszReading), dwStyle,
+    TRACE("(%p, %s, %ld, %s):\n", hKL, debugstr_a(lpszReading), dwStyle,
                     debugstr_a(lpszRegister));
     if (immHkl->hIME && immHkl->pImeRegisterWord)
     {
@@ -2436,7 +2436,7 @@ BOOL WINAPI ImmRegisterWordW(
   HKL hKL, LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszRegister)
 {
     ImmHkl *immHkl = IMM_GetImmHkl(hKL);
-    TRACE("(%p, %s, %d, %s):\n", hKL, debugstr_w(lpszReading), dwStyle,
+    TRACE("(%p, %s, %ld, %s):\n", hKL, debugstr_w(lpszReading), dwStyle,
                     debugstr_w(lpszRegister));
     if (immHkl->hIME && immHkl->pImeRegisterWord)
     {
@@ -2480,7 +2480,7 @@ LRESULT WINAPI ImmRequestMessageA(HIMC hIMC, WPARAM wParam, LPARAM lParam)
 {
     InputContextData *data = get_imc_data(hIMC);

-    TRACE("%p %ld %ld\n", hIMC, wParam, wParam);
+    TRACE("%p %Id %Id\n", hIMC, wParam, wParam);

if (data) return SendMessageA(data->IMC.hWnd, WM_IME_REQUEST, wParam, lParam);

@@ -2495,7 +2495,7 @@ LRESULT WINAPI ImmRequestMessageW(HIMC hIMC, WPARAM wParam, LPARAM lParam)
 {
     InputContextData *data = get_imc_data(hIMC);

-    TRACE("%p %ld %ld\n", hIMC, wParam, wParam);
+    TRACE("%p %Id %Id\n", hIMC, wParam, wParam);

if (data) return SendMessageW(data->IMC.hWnd, WM_IME_REQUEST, wParam, lParam);

@@ -2519,7 +2519,7 @@ BOOL WINAPI ImmSetCandidateWindow(
     if (IMM_IsCrossThreadAccess(NULL, hIMC))
         return FALSE;

-    TRACE("\t%x, %x, %s, %s\n",
+    TRACE("\t%lx, %lx, %s, %s\n",
           lpCandidate->dwIndex, lpCandidate->dwStyle,
           wine_dbgstr_point(&lpCandidate->ptCurrentPos),
           wine_dbgstr_rect(&lpCandidate->rcArea));
@@ -2599,7 +2599,7 @@ BOOL WINAPI ImmSetCompositionStringA(
     BOOL rc;
     InputContextData *data = get_imc_data(hIMC);

-    TRACE("(%p, %d, %p, %d, %p, %d):\n",
+    TRACE("(%p, %ld, %p, %ld, %p, %ld):\n",
             hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen);

if (!data)
@@ -2654,7 +2654,7 @@ BOOL WINAPI ImmSetCompositionStringW(
     BOOL rc;
     InputContextData *data = get_imc_data(hIMC);

-    TRACE("(%p, %d, %p, %d, %p, %d):\n",
+    TRACE("(%p, %ld, %p, %ld, %p, %ld):\n",
             hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen);

if (!data)
@@ -2709,7 +2709,7 @@ BOOL WINAPI ImmSetCompositionWindow(

TRACE("(%p, %p)\n", hIMC, lpCompForm);
     if (lpCompForm)
-        TRACE("\t%x, %s, %s\n", lpCompForm->dwStyle,
+        TRACE("\t%lx, %s, %s\n", lpCompForm->dwStyle,
               wine_dbgstr_point(&lpCompForm->ptCurrentPos),
               wine_dbgstr_rect(&lpCompForm->rcArea));

@@ -2748,7 +2748,7 @@ BOOL WINAPI ImmSetConversionStatus(
     DWORD oldConversion, oldSentence;
     InputContextData *data = get_imc_data(hIMC);

-    TRACE("%p %d %d\n", hIMC, fdwConversion, fdwSentence);
+    TRACE("%p %ld %ld\n", hIMC, fdwConversion, fdwSentence);

if (!data)
     {
@@ -2878,7 +2878,7 @@ BOOL WINAPI ImmShowSoftKeyboard(HWND hSoftWnd, int nCmdShow)
  */
 BOOL WINAPI ImmSimulateHotKey(HWND hWnd, DWORD dwHotKeyID)
 {
-  FIXME("(%p, %d): stub\n", hWnd, dwHotKeyID);
+  FIXME("(%p, %ld): stub\n", hWnd, dwHotKeyID);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
   return FALSE;
 }
@@ -2890,7 +2890,7 @@ BOOL WINAPI ImmUnregisterWordA(
   HKL hKL, LPCSTR lpszReading, DWORD dwStyle, LPCSTR lpszUnregister)
 {
     ImmHkl *immHkl = IMM_GetImmHkl(hKL);
-    TRACE("(%p, %s, %d, %s):\n", hKL, debugstr_a(lpszReading), dwStyle,
+    TRACE("(%p, %s, %ld, %s):\n", hKL, debugstr_a(lpszReading), dwStyle,
             debugstr_a(lpszUnregister));
     if (immHkl->hIME && immHkl->pImeUnregisterWord)
     {
@@ -2920,7 +2920,7 @@ BOOL WINAPI ImmUnregisterWordW(
   HKL hKL, LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszUnregister)
 {
     ImmHkl *immHkl = IMM_GetImmHkl(hKL);
-    TRACE("(%p, %s, %d, %s):\n", hKL, debugstr_w(lpszReading), dwStyle,
+    TRACE("(%p, %s, %ld, %s):\n", hKL, debugstr_w(lpszReading), dwStyle,
             debugstr_w(lpszUnregister));
     if (immHkl->hIME && immHkl->pImeUnregisterWord)
     {
@@ -2951,7 +2951,7 @@ DWORD WINAPI ImmGetImeMenuItemsA( HIMC hIMC, DWORD dwFlags, DWORD dwType,
     DWORD dwSize)
 {
     InputContextData *data = get_imc_data(hIMC);
-    TRACE("(%p, %i, %i, %p, %p, %i):\n", hIMC, dwFlags, dwType,
+    TRACE("(%p, %li, %li, %p, %p, %li):\n", hIMC, dwFlags, dwType,
         lpImeParentMenu, lpImeMenu, dwSize);

if (!data)
@@ -3022,7 +3022,7 @@ DWORD WINAPI ImmGetImeMenuItemsW( HIMC hIMC, DWORD dwFlags, DWORD dwType,
    DWORD dwSize)
 {
     InputContextData *data = get_imc_data(hIMC);
-    TRACE("(%p, %i, %i, %p, %p, %i):\n", hIMC, dwFlags, dwType,
+    TRACE("(%p, %li, %li, %p, %p, %li):\n", hIMC, dwFlags, dwType,
         lpImeParentMenu, lpImeMenu, dwSize);

if (!data)
@@ -3190,7 +3190,7 @@ BOOL WINAPI ImmGenerateMessage(HIMC hIMC)
         return FALSE;
     }

-    TRACE("%i messages queued\n",data->IMC.dwNumMsgBuf);
+    TRACE("%li messages queued\n",data->IMC.dwNumMsgBuf);
     if (data->IMC.dwNumMsgBuf > 0)
     {
         LPTRANSMSG lpTransMsg;
@@ -3290,7 +3290,7 @@ BOOL WINAPI ImmProcessKey(HWND hwnd, HKL hKL, UINT vKey, LPARAM lKeyData, DWORD
     HIMC imc = ImmGetContext(hwnd);
     BYTE state[256];

-    TRACE("%p %p %x %x %x\n",hwnd, hKL, vKey, (UINT)lKeyData, unknown);
+    TRACE("%p %p %x %x %lx\n",hwnd, hKL, vKey, (UINT)lKeyData, unknown);

if (imc)
         data = imc;
@@ -3352,7 +3352,7 @@ BOOL WINAPI ImmEnumInputContext(DWORD idThread, IMCENUMPROC lpfn, LPARAM lParam)

BOOL WINAPI ImmGetHotKey(DWORD hotkey, UINT *modifiers, UINT *key, HKL hkl)
 {
-    FIXME("%x, %p, %p, %p: stub\n", hotkey, modifiers, key, hkl);
+    FIXME("%lx, %p, %p, %p: stub\n", hotkey, modifiers, key, hkl);
     return FALSE;
 }

[PATCH 07/23] dlls/inetcomm: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech

---
 dlls/inetcomm/Makefile.in     |    1 
 dlls/inetcomm/imaptransport.c |   44 ++++++------
 dlls/inetcomm/inetcomm_main.c |    2 -
 dlls/inetcomm/mimeintl.c      |    8 +-
 dlls/inetcomm/mimeole.c       |  146 +++++++++++++++++++++--------------------
 dlls/inetcomm/pop3transport.c |   34 +++++-----
 dlls/inetcomm/protocol.c      |   38 +++++------
 dlls/inetcomm/smtptransport.c |    8 +-
 8 files changed, 140 insertions(+), 141 deletions(-)

diff --git a/dlls/inetcomm/Makefile.in b/dlls/inetcomm/Makefile.in
index 8a728ca86e7..079f3128297 100644
--- a/dlls/inetcomm/Makefile.in
+++ b/dlls/inetcomm/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = inetcomm.dll
 IMPORTLIB = inetcomm
 IMPORTS   = uuid urlmon propsys oleaut32 ole32 ws2_32 user32 advapi32
diff --git a/dlls/inetcomm/imaptransport.c b/dlls/inetcomm/imaptransport.c
index 0da456eac8f..27ed5b37f36 100644
--- a/dlls/inetcomm/imaptransport.c
+++ b/dlls/inetcomm/imaptransport.c
@@ -191,35 +191,35 @@ static HRESULT WINAPI IMAPTransport_Capability(IIMAPTransport *iface,
 static HRESULT WINAPI IMAPTransport_Select(IIMAPTransport *iface,
     WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler, LPSTR lpszMailboxName)
 {
-    FIXME("(%ld, %ld, %p, %s): stub\n", wParam, lParam, pCBHandler, debugstr_a(lpszMailboxName));
+    FIXME("(%Id, %Id, %p, %s): stub\n", wParam, lParam, pCBHandler, debugstr_a(lpszMailboxName));
     return E_NOTIMPL;
 }

static HRESULT WINAPI IMAPTransport_Examine(IIMAPTransport *iface,
     WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler, LPSTR lpszMailboxName)
 {
-    FIXME("(%ld, %ld, %p, %s): stub\n", wParam, lParam, pCBHandler, debugstr_a(lpszMailboxName));
+    FIXME("(%Id, %Id, %p, %s): stub\n", wParam, lParam, pCBHandler, debugstr_a(lpszMailboxName));
     return E_NOTIMPL;
 }

static HRESULT WINAPI IMAPTransport_Create(IIMAPTransport *iface,
     WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler, LPSTR lpszMailboxName)
 {
-    FIXME("(%ld, %ld, %p, %s): stub\n", wParam, lParam, pCBHandler, debugstr_a(lpszMailboxName));
+    FIXME("(%Id, %Id, %p, %s): stub\n", wParam, lParam, pCBHandler, debugstr_a(lpszMailboxName));
     return E_NOTIMPL;
 }

static HRESULT WINAPI IMAPTransport_Delete(IIMAPTransport *iface,
     WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler, LPSTR lpszMailboxName)
 {
-    FIXME("(%ld, %ld, %p, %s): stub\n", wParam, lParam, pCBHandler, debugstr_a(lpszMailboxName));
+    FIXME("(%Id, %Id, %p, %s): stub\n", wParam, lParam, pCBHandler, debugstr_a(lpszMailboxName));
     return E_NOTIMPL;
 }

static HRESULT WINAPI IMAPTransport_Rename(IIMAPTransport *iface, WPARAM wParam, LPARAM lParam,
     IIMAPCallback *pCBHandler, LPSTR lpszMailboxName, LPSTR lpszNewMailboxName)
 {
-    FIXME("(%ld, %ld, %p, %s, %s): stub\n", wParam, lParam, pCBHandler,
+    FIXME("(%Id, %Id, %p, %s, %s): stub\n", wParam, lParam, pCBHandler,
           debugstr_a(lpszMailboxName), debugstr_a(lpszNewMailboxName));
     return E_NOTIMPL;
 }
@@ -227,21 +227,21 @@ static HRESULT WINAPI IMAPTransport_Rename(IIMAPTransport *iface, WPARAM wParam,
 static HRESULT WINAPI IMAPTransport_Subscribe(IIMAPTransport *iface,
     WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler, LPSTR lpszMailboxName)
 {
-    FIXME("(%ld, %ld, %p, %s): stub\n", wParam, lParam, pCBHandler, debugstr_a(lpszMailboxName));
+    FIXME("(%Id, %Id, %p, %s): stub\n", wParam, lParam, pCBHandler, debugstr_a(lpszMailboxName));
     return E_NOTIMPL;
 }

static HRESULT WINAPI IMAPTransport_Unsubscribe(IIMAPTransport *iface,
     WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler, LPSTR lpszMailboxName)
 {
-    FIXME("(%ld, %ld, %p, %s): stub\n", wParam, lParam, pCBHandler, debugstr_a(lpszMailboxName));
+    FIXME("(%Id, %Id, %p, %s): stub\n", wParam, lParam, pCBHandler, debugstr_a(lpszMailboxName));
     return E_NOTIMPL;
 }

static HRESULT WINAPI IMAPTransport_List(IIMAPTransport *iface, WPARAM wParam, LPARAM lParam,
     IIMAPCallback *pCBHandler, LPSTR lpszMailboxNameReference, LPSTR lpszMailboxNamePattern)
 {
-    FIXME("(%ld, %ld, %p, %s, %s): stub\n", wParam, lParam, pCBHandler,
+    FIXME("(%Id, %Id, %p, %s, %s): stub\n", wParam, lParam, pCBHandler,
           debugstr_a(lpszMailboxNameReference), debugstr_a(lpszMailboxNamePattern));
     return E_NOTIMPL;
 }
@@ -249,7 +249,7 @@ static HRESULT WINAPI IMAPTransport_List(IIMAPTransport *iface, WPARAM wParam, L
 static HRESULT WINAPI IMAPTransport_Lsub(IIMAPTransport *iface, WPARAM wParam, LPARAM lParam,
     IIMAPCallback *pCBHandler, LPSTR lpszMailboxNameReference, LPSTR lpszMailboxNamePattern)
 {
-    FIXME("(%ld, %ld, %p, %s, %s): stub\n", wParam, lParam, pCBHandler,
+    FIXME("(%Id, %Id, %p, %s, %s): stub\n", wParam, lParam, pCBHandler,
           debugstr_a(lpszMailboxNameReference), debugstr_a(lpszMailboxNamePattern));
     return E_NOTIMPL;
 }
@@ -258,7 +258,7 @@ static HRESULT WINAPI IMAPTransport_Append(IIMAPTransport *iface,
     WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler, LPSTR lpszMailboxName,
     LPSTR lpszMessageFlags, FILETIME ftMessageDateTime, LPSTREAM lpstmMessageToSave)
 {
-    FIXME("(%ld, %ld, %p, %s, %s, %p): stub\n", wParam, lParam, pCBHandler,
+    FIXME("(%Id, %Id, %p, %s, %s, %p): stub\n", wParam, lParam, pCBHandler,
           debugstr_a(lpszMailboxName), debugstr_a(lpszMessageFlags), lpstmMessageToSave);
     return E_NOTIMPL;
 }
@@ -266,14 +266,14 @@ static HRESULT WINAPI IMAPTransport_Append(IIMAPTransport *iface,
 static HRESULT WINAPI IMAPTransport_Close(IIMAPTransport *iface,
     WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler)
 {
-    FIXME("(%ld, %ld, %p): stub\n", wParam, lParam, pCBHandler);
+    FIXME("(%Id, %Id, %p): stub\n", wParam, lParam, pCBHandler);
     return E_NOTIMPL;
 }

static HRESULT WINAPI IMAPTransport_Expunge(IIMAPTransport *iface,
     WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler)
 {
-    FIXME("(%ld, %ld, %p): stub\n", wParam, lParam, pCBHandler);
+    FIXME("(%Id, %Id, %p): stub\n", wParam, lParam, pCBHandler);
     return E_NOTIMPL;
 }

@@ -281,7 +281,7 @@ static HRESULT WINAPI IMAPTransport_Search(IIMAPTransport *iface,
     WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler, LPSTR lpszSearchCriteria,
     boolean bReturnUIDs, IRangeList *pMsgRange, boolean bUIDRangeList)
 {
-    FIXME("(%ld, %ld, %p, %s, %d, %p, %d): stub\n", wParam, lParam, pCBHandler,
+    FIXME("(%Id, %Id, %p, %s, %d, %p, %d): stub\n", wParam, lParam, pCBHandler,
           debugstr_a(lpszSearchCriteria), bReturnUIDs, pMsgRange, bUIDRangeList);
     return E_NOTIMPL;
 }
@@ -289,7 +289,7 @@ static HRESULT WINAPI IMAPTransport_Search(IIMAPTransport *iface,
 static HRESULT WINAPI IMAPTransport_Fetch(IIMAPTransport *iface, WPARAM wParam, LPARAM lParam,
     IIMAPCallback *pCBHandler, IRangeList *pMsgRange, boolean bUIDMsgRange, LPSTR lpszFetchArgs)
 {
-    FIXME("(%ld, %ld, %p, %p, %d, %s): stub\n", wParam, lParam, pCBHandler, pMsgRange,
+    FIXME("(%Id, %Id, %p, %p, %d, %s): stub\n", wParam, lParam, pCBHandler, pMsgRange,
           bUIDMsgRange, debugstr_a(lpszFetchArgs));
     return E_NOTIMPL;
 }
@@ -297,7 +297,7 @@ static HRESULT WINAPI IMAPTransport_Fetch(IIMAPTransport *iface, WPARAM wParam,
 static HRESULT WINAPI IMAPTransport_Store(IIMAPTransport *iface, WPARAM wParam, LPARAM lParam,
     IIMAPCallback *pCBHandler, IRangeList *pMsgRange, boolean bUIDRangeList, LPSTR lpszStoreArgs)
 {
-    FIXME("(%ld, %ld, %p, %p, %d, %s): stub\n", wParam, lParam, pCBHandler, pMsgRange,
+    FIXME("(%Id, %Id, %p, %p, %d, %s): stub\n", wParam, lParam, pCBHandler, pMsgRange,
           bUIDRangeList, debugstr_a(lpszStoreArgs));
     return E_NOTIMPL;
 }
@@ -305,7 +305,7 @@ static HRESULT WINAPI IMAPTransport_Store(IIMAPTransport *iface, WPARAM wParam,
 static HRESULT WINAPI IMAPTransport_Copy(IIMAPTransport *iface, WPARAM wParam, LPARAM lParam,
     IIMAPCallback *pCBHandler, IRangeList *pMsgRange, boolean bUIDRangeList, LPSTR lpszMailboxName)
 {
-    FIXME("(%ld, %ld, %p, %p, %d, %s): stub\n", wParam, lParam, pCBHandler, pMsgRange,
+    FIXME("(%Id, %Id, %p, %p, %d, %s): stub\n", wParam, lParam, pCBHandler, pMsgRange,
           bUIDRangeList, debugstr_a(lpszMailboxName));
     return E_NOTIMPL;
 }
@@ -313,33 +313,33 @@ static HRESULT WINAPI IMAPTransport_Copy(IIMAPTransport *iface, WPARAM wParam, L
 static HRESULT WINAPI IMAPTransport_Noop(IIMAPTransport *iface,
     WPARAM wParam, LPARAM lParam, IIMAPCallback *pCBHandler)
 {
-    FIXME("(%ld, %ld, %p): stub\n", wParam, lParam, pCBHandler);
+    FIXME("(%Id, %Id, %p): stub\n", wParam, lParam, pCBHandler);
     return E_NOTIMPL;
 }

static HRESULT WINAPI IMAPTransport_ResizeMsgSeqNumTable(IIMAPTransport *iface, DWORD dwSizeOfMbox)
 {
-    FIXME("(%u): stub\n", dwSizeOfMbox);
+    FIXME("(%lu): stub\n", dwSizeOfMbox);
     return E_NOTIMPL;
 }

static HRESULT WINAPI IMAPTransport_UpdateSeqNumToUID(IIMAPTransport *iface,
     DWORD dwMsgSeqNum, DWORD dwUID)
 {
-    FIXME("(%u, %u): stub\n", dwMsgSeqNum, dwUID);
+    FIXME("(%lu, %lu): stub\n", dwMsgSeqNum, dwUID);
     return E_NOTIMPL;
 }

static HRESULT WINAPI IMAPTransport_RemoveSequenceNum(IIMAPTransport *iface, DWORD dwDeletedMsgSeqNum)
 {
-    FIXME("(%u): stub\n", dwDeletedMsgSeqNum);
+    FIXME("(%lu): stub\n", dwDeletedMsgSeqNum);
     return E_NOTIMPL;
 }

static HRESULT WINAPI IMAPTransport_MsgSeqNumToUID(IIMAPTransport *iface, DWORD dwMsgSeqNum,
     DWORD *pdwUID)
 {
-    FIXME("(%u, %p): stub\n", dwMsgSeqNum, pdwUID);
+    FIXME("(%lu, %p): stub\n", dwMsgSeqNum, pdwUID);
     return E_NOTIMPL;
 }

@@ -371,7 +371,7 @@ static HRESULT WINAPI IMAPTransport_SetDefaultCBHandler(IIMAPTransport *iface, I
 static HRESULT WINAPI IMAPTransport_Status(IIMAPTransport *iface, WPARAM wParam, LPARAM lParam,
     IIMAPCallback *pCBHandler, LPSTR pszMailboxName, LPSTR pszStatusCmdArgs)
 {
-    FIXME("(%ld, %ld, %p, %s, %s): stub\n", wParam, lParam, pCBHandler,
+    FIXME("(%Id, %Id, %p, %s, %s): stub\n", wParam, lParam, pCBHandler,
           debugstr_a(pszMailboxName), debugstr_a(pszStatusCmdArgs));
     return E_NOTIMPL;
 }
diff --git a/dlls/inetcomm/inetcomm_main.c b/dlls/inetcomm/inetcomm_main.c
index 61c408220ec..ad02f210d9a 100644
--- a/dlls/inetcomm/inetcomm_main.c
+++ b/dlls/inetcomm/inetcomm_main.c
@@ -42,7 +42,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
     static IMimeInternational *international;

-    TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved);
+    TRACE("(%p, %ld, %p)\n", hinstDLL, fdwReason, lpvReserved);

switch (fdwReason)
     {
diff --git a/dlls/inetcomm/mimeintl.c b/dlls/inetcomm/mimeintl.c
index 6a4230d09aa..0ac695afb39 100644
--- a/dlls/inetcomm/mimeintl.c
+++ b/dlls/inetcomm/mimeintl.c
@@ -166,7 +166,7 @@ static HRESULT WINAPI MimeInternat_GetCodePageCharset(IMimeInternational *iface,
     HRESULT hr;
     MIMECPINFO mlang_cp_info;

-    TRACE("(%p)->(%d, %d, %p)\n", iface, cpiCodePage, ctCsetType, phCharset);
+    TRACE("(%p)->(%ld, %d, %p)\n", iface, cpiCodePage, ctCsetType, phCharset);

*phCharset = NULL;

@@ -315,7 +315,7 @@ static HRESULT WINAPI MimeInternat_CanConvertCodePages(IMimeInternational *iface
     HRESULT hr;
     IMultiLanguage *ml;

-    TRACE("(%p)->(%d, %d)\n", iface, cpiSource, cpiDest);
+    TRACE("(%p)->(%ld, %ld)\n", iface, cpiSource, cpiDest);

/* Could call mlang.IsConvertINetStringAvailable() to avoid the COM overhead if need be. */

@@ -354,7 +354,7 @@ static HRESULT WINAPI MimeInternat_ConvertBuffer(IMimeInternational *iface, CODE
     HRESULT hr;
     IMultiLanguage *ml;

-    TRACE("(%p)->(%d, %d, %p, %p, %p)\n", iface, cpiSource, cpiDest, pIn, pOut, pcbRead);
+    TRACE("(%p)->(%ld, %ld, %p, %p, %p)\n", iface, cpiSource, cpiDest, pIn, pOut, pcbRead);

*pcbRead = 0;
     pOut->cbSize = 0;
@@ -404,7 +404,7 @@ static HRESULT WINAPI MimeInternat_ConvertString(IMimeInternational *iface, CODE
     int src_len;
     IMultiLanguage *ml;

-    TRACE("(%p)->(%d, %d, %p %p)\n", iface, cpiSource, cpiDest, pIn, pOut);
+    TRACE("(%p)->(%ld, %ld, %p %p)\n", iface, cpiSource, cpiDest, pIn, pOut);

switch(pIn->vt)
     {
diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c
index 9f2c3b83647..0fe8f7e5278 100644
--- a/dlls/inetcomm/mimeole.c
+++ b/dlls/inetcomm/mimeole.c
@@ -204,7 +204,7 @@ static ULONG WINAPI sub_stream_AddRef(IStream *iface)
     sub_stream_t *This = impl_from_IStream(iface);
     LONG ref = InterlockedIncrement(&This->ref);

-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);

return ref;
 }
@@ -214,7 +214,7 @@ static ULONG WINAPI sub_stream_Release(IStream *iface)
     sub_stream_t *This = impl_from_IStream(iface);
     LONG ref = InterlockedDecrement(&This->ref);

-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);

if(!ref)
     {
@@ -234,7 +234,7 @@ static HRESULT WINAPI sub_stream_Read(
     HRESULT hr;
     LARGE_INTEGER tmp_pos;

-    TRACE("(%p, %d, %p)\n", pv, cb, pcbRead);
+    TRACE("(%p, %ld, %p)\n", pv, cb, pcbRead);

tmp_pos.QuadPart = This->pos.QuadPart + This->start.QuadPart;
     IStream_Seek(This->base, tmp_pos, STREAM_SEEK_SET, NULL);
@@ -268,7 +268,7 @@ static HRESULT WINAPI sub_stream_Seek(
     sub_stream_t *This = impl_from_IStream(iface);
     LARGE_INTEGER new_pos;

-    TRACE("(%08x.%08x, %x, %p)\n", dlibMove.u.HighPart, dlibMove.u.LowPart, dwOrigin, plibNewPosition);
+    TRACE("(%08lx.%08lx, %lx, %p)\n", dlibMove.u.HighPart, dlibMove.u.LowPart, dwOrigin, plibNewPosition);

switch(dwOrigin)
     {
@@ -315,7 +315,7 @@ static HRESULT WINAPI sub_stream_CopyTo(
     ULARGE_INTEGER totalBytesRead;
     ULARGE_INTEGER totalBytesWritten;

-    TRACE("(%p)->(%p, %d, %p, %p)\n", iface, pstm, cb.u.LowPart, pcbRead, pcbWritten);
+    TRACE("(%p)->(%p, %ld, %p, %p)\n", iface, pstm, cb.u.LowPart, pcbRead, pcbWritten);

totalBytesRead.QuadPart = 0;
     totalBytesWritten.QuadPart = 0;
@@ -392,7 +392,7 @@ static HRESULT WINAPI sub_stream_Stat(
         DWORD grfStatFlag)
 {
     sub_stream_t *This = impl_from_IStream(iface);
-    FIXME("(%p)->(%p, %08x)\n", This, pstatstg, grfStatFlag);
+    FIXME("(%p)->(%p, %08lx)\n", This, pstatstg, grfStatFlag);
     memset(pstatstg, 0, sizeof(*pstatstg));
     pstatstg->cbSize = This->length;
     return S_OK;
@@ -566,7 +566,7 @@ static header_t *read_prop(MimeBody *body, char **ptr)
     {
         if(!lstrcmpiA(*ptr, prop->name))
         {
-            TRACE("%s: found match with default property id %d\n", *ptr, prop->id);
+            TRACE("%s: found match with default property id %ld\n", *ptr, prop->id);
             break;
         }
     }
@@ -578,7 +578,7 @@ static header_t *read_prop(MimeBody *body, char **ptr)
         {
             if(!lstrcmpiA(*ptr, prop_entry->prop.name))
             {
-                TRACE("%s: found match with already added new property id %d\n", *ptr, prop_entry->prop.id);
+                TRACE("%s: found match with already added new property id %ld\n", *ptr, prop_entry->prop.id);
                 prop = &prop_entry->prop;
                 break;
             }
@@ -592,7 +592,7 @@ static header_t *read_prop(MimeBody *body, char **ptr)
             prop_entry->prop.default_vt = VT_LPSTR;
             list_add_tail(&body->new_props, &prop_entry->entry);
             prop = &prop_entry->prop;
-            TRACE("%s: allocating new prop id %d\n", *ptr, prop_entry->prop.id);
+            TRACE("%s: allocating new prop id %ld\n", *ptr, prop_entry->prop.id);
         }
     }

@@ -905,7 +905,7 @@ static const property_t *find_default_prop(const char *name)
     }

if(prop_def->id)
-       TRACE("%s: found match with default property id %d\n", prop_def->name, prop_def->id);
+       TRACE("%s: found match with default property id %ld\n", prop_def->name, prop_def->id);
     else
        prop_def = NULL;

@@ -944,7 +944,7 @@ static ULONG WINAPI MimeBody_AddRef(IMimeBody *iface)
     MimeBody *This = impl_from_IMimeBody(iface);
     LONG ref = InterlockedIncrement(&This->ref);

-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);

return ref;
 }
@@ -954,7 +954,7 @@ static ULONG WINAPI MimeBody_Release(IMimeBody *iface)
     MimeBody *This = impl_from_IMimeBody(iface);
     LONG ref = InterlockedDecrement(&This->ref);

-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);

if (!ref)
     {
@@ -1041,10 +1041,10 @@ static HRESULT WINAPI MimeBody_GetPropInfo(
     if(!pszName || !pInfo)
         return E_INVALIDARG;

-    TRACE("mask 0x%04x\n", pInfo->dwMask);
+    TRACE("mask 0x%04lx\n", pInfo->dwMask);

if(pInfo->dwMask & ~supported)
-         FIXME("Unsupported mask flags 0x%04x\n", pInfo->dwMask & ~supported);
+         FIXME("Unsupported mask flags 0x%04lx\n", pInfo->dwMask & ~supported);

hr = find_prop(This, pszName, &header);
     if(hr == S_OK)
@@ -1090,7 +1090,7 @@ static HRESULT WINAPI MimeBody_GetProp(
     header_t *header;
     HRESULT hr;

-    TRACE("(%p)->(%s, 0x%x, %p)\n", This, debugstr_a(pszName), dwFlags, pValue);
+    TRACE("(%p)->(%s, 0x%lx, %p)\n", This, debugstr_a(pszName), dwFlags, pValue);

if(!pszName || !pValue)
         return E_INVALIDARG;
@@ -1126,7 +1126,7 @@ static HRESULT WINAPI MimeBody_SetProp(
     header_t *header;
     HRESULT hr;

-    TRACE("(%p)->(%s, 0x%x, %p)\n", This, debugstr_a(pszName), dwFlags, pValue);
+    TRACE("(%p)->(%s, 0x%lx, %p)\n", This, debugstr_a(pszName), dwFlags, pValue);

if(!pszName || !pValue)
         return E_INVALIDARG;
@@ -1143,14 +1143,14 @@ static HRESULT WINAPI MimeBody_SetProp(
             {
                 if(STRTOPID(pszName) == prop_entry->prop.id)
                 {
-                    TRACE("Found match with already added new property id %d\n", prop_entry->prop.id);
+                    TRACE("Found match with already added new property id %ld\n", prop_entry->prop.id);
                     prop = &prop_entry->prop;
                     break;
                 }
             }
             else if(!lstrcmpiA(pszName, prop_entry->prop.name))
             {
-                TRACE("Found match with already added new property id %d\n", prop_entry->prop.id);
+                TRACE("Found match with already added new property id %ld\n", prop_entry->prop.id);
                 prop = &prop_entry->prop;
                 break;
             }
@@ -1193,7 +1193,7 @@ static HRESULT WINAPI MimeBody_SetProp(
             prop_entry->prop.default_vt = pValue->vt;
             list_add_tail(&This->new_props, &prop_entry->entry);
             prop = &prop_entry->prop;
-            TRACE("Allocating new prop id %d\n", prop_entry->prop.id);
+            TRACE("Allocating new prop id %ld\n", prop_entry->prop.id);
         }

header->prop = prop;
@@ -1214,7 +1214,7 @@ static HRESULT WINAPI MimeBody_AppendProp(
                                  LPPROPVARIANT pValue)
 {
     MimeBody *This = impl_from_IMimeBody(iface);
-    FIXME("(%p)->(%s, 0x%x, %p) stub\n", This, debugstr_a(pszName), dwFlags, pValue);
+    FIXME("(%p)->(%s, 0x%lx, %p) stub\n", This, debugstr_a(pszName), dwFlags, pValue);
     return E_NOTIMPL;
 }

@@ -1252,7 +1252,7 @@ static HRESULT WINAPI MimeBody_CopyProps(
                                 IMimePropertySet* pPropertySet)
 {
     MimeBody *This = impl_from_IMimeBody(iface);
-    FIXME("(%p)->(%d, %p, %p) stub\n", This, cNames, prgszName, pPropertySet);
+    FIXME("(%p)->(%ld, %p, %p) stub\n", This, cNames, prgszName, pPropertySet);
     return E_NOTIMPL;
 }

@@ -1263,7 +1263,7 @@ static HRESULT WINAPI MimeBody_MoveProps(
                                 IMimePropertySet* pPropertySet)
 {
     MimeBody *This = impl_from_IMimeBody(iface);
-    FIXME("(%p)->(%d, %p, %p) stub\n", This, cNames, prgszName, pPropertySet);
+    FIXME("(%p)->(%ld, %p, %p) stub\n", This, cNames, prgszName, pPropertySet);
     return E_NOTIMPL;
 }

@@ -1273,7 +1273,7 @@ static HRESULT WINAPI MimeBody_DeleteExcept(
                                    LPCSTR* prgszName)
 {
     MimeBody *This = impl_from_IMimeBody(iface);
-    FIXME("(%p)->(%d, %p) stub\n", This, cNames, prgszName);
+    FIXME("(%p)->(%ld, %p) stub\n", This, cNames, prgszName);
     return E_NOTIMPL;
 }

@@ -1405,26 +1405,26 @@ static HRESULT WINAPI MimeBody_SetOption(
 {
     MimeBody *This = impl_from_IMimeBody(iface);
     HRESULT hr = E_NOTIMPL;
-    TRACE("(%p)->(%08x, %p)\n", This, oid, pValue);
+    TRACE("(%p)->(%08lx, %p)\n", This, oid, pValue);

if(pValue->vt != TYPEDID_TYPE(oid))
     {
-        WARN("Called with vartype %04x and oid %08x\n", pValue->vt, oid);
+        WARN("Called with vartype %04x and oid %08lx\n", pValue->vt, oid);
         return E_INVALIDARG;
     }

switch(oid)
     {
     case OID_SECURITY_HWND_OWNER:
-        FIXME("OID_SECURITY_HWND_OWNER (value %08x): ignoring\n", pValue->ulVal);
+        FIXME("OID_SECURITY_HWND_OWNER (value %08lx): ignoring\n", pValue->ulVal);
         hr = S_OK;
         break;
     case OID_TRANSMIT_BODY_ENCODING:
-        FIXME("OID_TRANSMIT_BODY_ENCODING (value %08x): ignoring\n", pValue->ulVal);
+        FIXME("OID_TRANSMIT_BODY_ENCODING (value %08lx): ignoring\n", pValue->ulVal);
         hr = S_OK;
         break;
     default:
-        FIXME("Unhandled oid %08x\n", oid);
+        FIXME("Unhandled oid %08lx\n", oid);
     }

return hr;
@@ -1436,7 +1436,7 @@ static HRESULT WINAPI MimeBody_GetOption(
                                 LPPROPVARIANT pValue)
 {
     MimeBody *This = impl_from_IMimeBody(iface);
-    FIXME("(%p)->(%08x, %p): stub\n", This, oid, pValue);
+    FIXME("(%p)->(%08lx, %p): stub\n", This, oid, pValue);
     return E_NOTIMPL;
 }

@@ -1446,7 +1446,7 @@ static HRESULT WINAPI MimeBody_EnumProps(
                                 IMimeEnumProperties** ppEnum)
 {
     MimeBody *This = impl_from_IMimeBody(iface);
-    FIXME("(%p)->(0x%x, %p) stub\n", This, dwFlags, ppEnum);
+    FIXME("(%p)->(0x%lx, %p) stub\n", This, dwFlags, ppEnum);
     return E_NOTIMPL;
 }

@@ -1877,7 +1877,7 @@ static IMimeBodyVtbl body_vtbl =

static HRESULT MimeBody_set_offsets(MimeBody *body, const BODYOFFSETS *offsets)
 {
-    TRACE("setting offsets to %d, %d, %d, %d\n", offsets->cbBoundaryStart,
+    TRACE("setting offsets to %ld, %ld, %ld, %ld\n", offsets->cbBoundaryStart,
           offsets->cbHeaderStart, offsets->cbBodyStart, offsets->cbBodyEnd);

body->body_offsets = *offsets;
@@ -1983,7 +1983,7 @@ static ULONG WINAPI MimeMessage_AddRef(IMimeMessage *iface)
     MimeMessage *This = impl_from_IMimeMessage(iface);
     ULONG ref = InterlockedIncrement(&This->ref);

-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);

return ref;
 }
@@ -2005,7 +2005,7 @@ static ULONG WINAPI MimeMessage_Release(IMimeMessage *iface)
     MimeMessage *This = impl_from_IMimeMessage(iface);
     ULONG ref = InterlockedDecrement(&This->ref);

-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);

if (!ref)
     {
@@ -2266,7 +2266,7 @@ static HRESULT WINAPI MimeMessage_GetMessageSource(IMimeMessage *iface, IStream
 {
     MimeMessage *This = impl_from_IMimeMessage(iface);

-    FIXME("(%p)->(%p, 0x%x)\n", iface, ppStream, dwFlags);
+    FIXME("(%p)->(%p, 0x%lx)\n", iface, ppStream, dwFlags);

IStream_AddRef(This->stream);
     *ppStream = This->stream;
@@ -2278,7 +2278,7 @@ static HRESULT WINAPI MimeMessage_GetMessageSize(
     ULONG *pcbSize,
     DWORD dwFlags)
 {
-    FIXME("(%p)->(%p, 0x%x)\n", iface, pcbSize, dwFlags);
+    FIXME("(%p)->(%p, 0x%lx)\n", iface, pcbSize, dwFlags);
     return E_NOTIMPL;
 }

@@ -2295,7 +2295,7 @@ static HRESULT WINAPI MimeMessage_SaveOffsetTable(
     IStream *pStream,
     DWORD dwFlags)
 {
-    FIXME("(%p)->(%p, 0x%x)\n", iface, pStream, dwFlags);
+    FIXME("(%p)->(%p, 0x%lx)\n", iface, pStream, dwFlags);
     return E_NOTIMPL;
 }

@@ -2312,7 +2312,7 @@ static HRESULT WINAPI MimeMessage_Commit(
     IMimeMessage *iface,
     DWORD dwFlags)
 {
-    FIXME("(%p)->(0x%x)\n", iface, dwFlags);
+    FIXME("(%p)->(0x%lx)\n", iface, dwFlags);
     return S_OK;
 }

@@ -2377,7 +2377,7 @@ static HRESULT WINAPI MimeMessage_SaveBody(
     DWORD dwFlags,
     IStream *pStream)
 {
-    FIXME("(%p)->(%p, 0x%x, %p)\n", iface, hBody, dwFlags, pStream);
+    FIXME("(%p)->(%p, 0x%lx, %p)\n", iface, hBody, dwFlags, pStream);
     return E_NOTIMPL;
 }

@@ -2485,7 +2485,7 @@ static HRESULT WINAPI MimeMessage_DeleteBody(
     HBODY hBody,
     DWORD dwFlags)
 {
-    FIXME("(%p)->(%p, %08x)\n", iface, hBody, dwFlags);
+    FIXME("(%p)->(%p, %08lx)\n", iface, hBody, dwFlags);
     return E_NOTIMPL;
 }

@@ -2589,7 +2589,7 @@ static HRESULT WINAPI MimeMessage_ResolveURL(
     DWORD dwFlags,
     LPHBODY phBody)
 {
-    FIXME("(%p)->(%p, %s, %s, 0x%x, %p)\n", iface, hRelated, pszBase, pszURL, dwFlags, phBody);
+    FIXME("(%p)->(%p, %s, %s, 0x%lx, %p)\n", iface, hRelated, pszBase, pszURL, dwFlags, phBody);
     return E_NOTIMPL;
 }

@@ -2688,7 +2688,7 @@ static HRESULT WINAPI MimeMessage_GetBodyProp(
     HRESULT hr;
     IMimeBody *mime_body;

-    TRACE("(%p)->(%p, %s, 0x%x, %p)\n", iface, hBody, pszName, dwFlags, pValue);
+    TRACE("(%p)->(%p, %s, 0x%lx, %p)\n", iface, hBody, pszName, dwFlags, pValue);

hr = IMimeMessage_BindToObject(iface, hBody, &IID_IMimeBody, (void**)&mime_body);
     if(hr != S_OK) return hr;
@@ -2706,7 +2706,7 @@ static HRESULT WINAPI MimeMessage_SetBodyProp(
     DWORD dwFlags,
     LPCPROPVARIANT pValue)
 {
-    FIXME("(%p)->(%p, %s, 0x%x, %p)\n", iface, hBody, pszName, dwFlags, pValue);
+    FIXME("(%p)->(%p, %s, 0x%lx, %p)\n", iface, hBody, pszName, dwFlags, pValue);
     return E_NOTIMPL;
 }

@@ -2725,20 +2725,20 @@ static HRESULT WINAPI MimeMessage_SetOption(
     LPCPROPVARIANT pValue)
 {
     HRESULT hr = S_OK;
-    TRACE("(%p)->(%08x, %p)\n", iface, oid, pValue);
+    TRACE("(%p)->(%08lx, %p)\n", iface, oid, pValue);

/* Message ID is checked before type.
      *  OID 0x4D -> 0x56 and 0x58 aren't defined but will filtered out later.
      */
     if(TYPEDID_ID(oid) < TYPEDID_ID(OID_ALLOW_8BIT_HEADER) || TYPEDID_ID(oid) > TYPEDID_ID(OID_SECURITY_2KEY_CERT_BAG_64))
     {
-        WARN("oid (%08x) out of range\n", oid);
+        WARN("oid (%08lx) out of range\n", oid);
         return MIME_E_INVALID_OPTION_ID;
     }

if(pValue->vt != TYPEDID_TYPE(oid))
     {
-        WARN("Called with vartype %04x and oid %08x\n", pValue->vt, oid);
+        WARN("Called with vartype %04x and oid %08lx\n", pValue->vt, oid);
         return S_OK;
     }

@@ -2757,7 +2757,7 @@ static HRESULT WINAPI MimeMessage_SetOption(
         FIXME("OID_CLEANUP_TREE_ON_SAVE (value %d): ignoring\n", pValue->boolVal);
         break;
     default:
-        FIXME("Unhandled oid %08x\n", oid);
+        FIXME("Unhandled oid %08lx\n", oid);
         hr = MIME_E_INVALID_OPTION_ID;
     }

@@ -2769,7 +2769,7 @@ static HRESULT WINAPI MimeMessage_GetOption(
     const TYPEDID oid,
     LPPROPVARIANT pValue)
 {
-    FIXME("(%p)->(%08x, %p)\n", iface, oid, pValue);
+    FIXME("(%p)->(%08lx, %p)\n", iface, oid, pValue);
     return E_NOTIMPL;
 }

@@ -2792,7 +2792,7 @@ static HRESULT WINAPI MimeMessage_GetProp(
     DWORD dwFlags,
     LPPROPVARIANT pValue)
 {
-    FIXME("(%p)->(%s, 0x%x, %p)\n", iface, pszName, dwFlags, pValue);
+    FIXME("(%p)->(%s, 0x%lx, %p)\n", iface, pszName, dwFlags, pValue);
     return E_NOTIMPL;
 }

@@ -2802,7 +2802,7 @@ static HRESULT WINAPI MimeMessage_SetProp(
     DWORD dwFlags,
     LPCPROPVARIANT pValue)
 {
-    FIXME("(%p)->(%s, 0x%x, %p)\n", iface, pszName, dwFlags, pValue);
+    FIXME("(%p)->(%s, 0x%lx, %p)\n", iface, pszName, dwFlags, pValue);
     return E_NOTIMPL;
 }

@@ -2840,7 +2840,7 @@ static HRESULT WINAPI MimeMessage_GetTextBody(
     static char plain[] = "plain";
     static char html[] = "html";

-    TRACE("(%p)->(%d, %d, %p, %p)\n", iface, dwTxtType, ietEncoding, pStream, phBody);
+    TRACE("(%p)->(%ld, %d, %p, %p)\n", iface, dwTxtType, ietEncoding, pStream, phBody);

find_struct.pszPriType = text;

@@ -2859,7 +2859,7 @@ static HRESULT WINAPI MimeMessage_GetTextBody(
     hr = IMimeMessage_FindFirst(iface, &find_struct, &hbody);
     if(hr != S_OK)
     {
-        TRACE("not found hr %08x\n", hr);
+        TRACE("not found hr %08lx\n", hr);
         *phBody = NULL;
         return hr;
     }
@@ -2880,7 +2880,7 @@ static HRESULT WINAPI MimeMessage_SetTextBody(
     IStream *pStream,
     LPHBODY phBody)
 {
-    FIXME("(%p)->(%d, %d, %p, %p, %p)\n", iface, dwTxtType, ietEncoding, hAlternative, pStream, phBody);
+    FIXME("(%p)->(%ld, %d, %p, %p, %p)\n", iface, dwTxtType, ietEncoding, hAlternative, pStream, phBody);
     return E_NOTIMPL;
 }

@@ -2913,7 +2913,7 @@ static HRESULT WINAPI MimeMessage_AttachURL(
     LPSTR *ppszCIDURL,
     LPHBODY phBody)
 {
-    FIXME("(%p)->(%s, %s, 0x%x, %p, %p, %p)\n", iface, pszBase, pszURL, dwFlags, pstmURL, ppszCIDURL, phBody);
+    FIXME("(%p)->(%s, %s, 0x%lx, %p, %p, %p)\n", iface, pszBase, pszURL, dwFlags, pstmURL, ppszCIDURL, phBody);
     return E_NOTIMPL;
 }

@@ -2938,7 +2938,7 @@ static HRESULT WINAPI MimeMessage_GetAttachments(
     while(hr == S_OK)
     {
         hr = IMimeMessage_IsContentType(iface, hbody, "multipart", NULL);
-        TRACE("IsCT rets %08x %d\n", hr, *pcAttach);
+        TRACE("IsCT rets %08lx %ld\n", hr, *pcAttach);
         if(hr != S_OK)
         {
             if(*pcAttach + 1 > size)
@@ -2978,7 +2978,7 @@ static HRESULT WINAPI MimeMessage_GetAddressTypes(
     DWORD dwProps,
     LPADDRESSLIST pList)
 {
-    FIXME("(%p)->(%d, %d, %p)\n", iface, dwAdrTypes, dwProps, pList);
+    FIXME("(%p)->(%ld, %ld, %p)\n", iface, dwAdrTypes, dwProps, pList);
     return E_NOTIMPL;
 }

@@ -2988,7 +2988,7 @@ static HRESULT WINAPI MimeMessage_GetAddressFormat(
     ADDRESSFORMAT format,
     LPSTR *ppszFormat)
 {
-    FIXME("(%p)->(%d, %d, %p)\n", iface, dwAdrTypes, format, ppszFormat);
+    FIXME("(%p)->(%ld, %d, %p)\n", iface, dwAdrTypes, format, ppszFormat);
     return E_NOTIMPL;
 }

@@ -2998,7 +2998,7 @@ static HRESULT WINAPI MimeMessage_EnumAddressTypes(
     DWORD dwProps,
     IMimeEnumAddressTypes **ppEnum)
 {
-    FIXME("(%p)->(%d, %d, %p)\n", iface, dwAdrTypes, dwProps, ppEnum);
+    FIXME("(%p)->(%ld, %ld, %p)\n", iface, dwAdrTypes, dwProps, ppEnum);
     return E_NOTIMPL;
 }

@@ -3007,7 +3007,7 @@ static HRESULT WINAPI MimeMessage_SplitMessage(
     ULONG cbMaxPart,
     IMimeMessageParts **ppParts)
 {
-    FIXME("(%p)->(%d, %p)\n", iface, cbMaxPart, ppParts);
+    FIXME("(%p)->(%ld, %p)\n", iface, cbMaxPart, ppParts);
     return E_NOTIMPL;
 }

@@ -3126,7 +3126,7 @@ HRESULT WINAPI MimeOleCreateMessage(IUnknown *pUnkOuter, IMimeMessage **ppMessag
  */
 HRESULT WINAPI MimeOleSetCompatMode(DWORD dwMode)
 {
-    FIXME("(0x%x)\n", dwMode);
+    FIXME("(0x%lx)\n", dwMode);
     return S_OK;
 }

@@ -3175,7 +3175,7 @@ static ULONG WINAPI MimeSecurity_AddRef(IMimeSecurity *iface)
     MimeSecurity *This = impl_from_IMimeSecurity(iface);
     LONG ref = InterlockedIncrement(&This->ref);

-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);

return ref;
 }
@@ -3185,7 +3185,7 @@ static ULONG WINAPI MimeSecurity_Release(IMimeSecurity *iface)
     MimeSecurity *This = impl_from_IMimeSecurity(iface);
     LONG ref = InterlockedDecrement(&This->ref);

-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);

if (!ref)
         HeapFree(GetProcessHeap(), 0, This);
@@ -3212,7 +3212,7 @@ static HRESULT WINAPI MimeSecurity_EncodeMessage(
         IMimeMessageTree* pTree,
         DWORD dwFlags)
 {
-    FIXME("(%p)->(%p, %08x): stub\n", iface, pTree, dwFlags);
+    FIXME("(%p)->(%p, %08lx): stub\n", iface, pTree, dwFlags);
     return E_NOTIMPL;
 }

@@ -3222,7 +3222,7 @@ static HRESULT WINAPI MimeSecurity_EncodeBody(
         HBODY hEncodeRoot,
         DWORD dwFlags)
 {
-    FIXME("(%p)->(%p, %p, %08x): stub\n", iface, pTree, hEncodeRoot, dwFlags);
+    FIXME("(%p)->(%p, %p, %08lx): stub\n", iface, pTree, hEncodeRoot, dwFlags);
     return E_NOTIMPL;
 }

@@ -3231,7 +3231,7 @@ static HRESULT WINAPI MimeSecurity_DecodeMessage(
         IMimeMessageTree* pTree,
         DWORD dwFlags)
 {
-    FIXME("(%p)->(%p, %08x): stub\n", iface, pTree, dwFlags);
+    FIXME("(%p)->(%p, %08lx): stub\n", iface, pTree, dwFlags);
     return E_NOTIMPL;
 }

@@ -3241,7 +3241,7 @@ static HRESULT WINAPI MimeSecurity_DecodeBody(
         HBODY hDecodeRoot,
         DWORD dwFlags)
 {
-    FIXME("(%p)->(%p, %p, %08x): stub\n", iface, pTree, hDecodeRoot, dwFlags);
+    FIXME("(%p)->(%p, %p, %08lx): stub\n", iface, pTree, hDecodeRoot, dwFlags);
     return E_NOTIMPL;
 }

@@ -3252,7 +3252,7 @@ static HRESULT WINAPI MimeSecurity_EnumCertificates(
         PCX509CERT pPrev,
         PCX509CERT* ppCert)
 {
-    FIXME("(%p)->(%p, %08x, %p, %p): stub\n", iface, hc, dwUsage, pPrev, ppCert);
+    FIXME("(%p)->(%p, %08lx, %p, %p): stub\n", iface, hc, dwUsage, pPrev, ppCert);
     return E_NOTIMPL;
 }

@@ -3415,7 +3415,7 @@ static HRESULT WINAPI MimeAlloc_FreeParamInfoArray(
         boolean fFreeArray)
 {
     ULONG i;
-    TRACE("(%p)->(%d, %p, %d)\n", iface, cParams, prgParam, fFreeArray);
+    TRACE("(%p)->(%ld, %p, %d)\n", iface, cParams, prgParam, fFreeArray);

for(i = 0; i < cParams; i++)
     {
@@ -3567,7 +3567,7 @@ static ULONG WINAPI propschema_AddRef(IMimePropertySchema *iface)
     propschema *This = impl_from_IMimePropertySchema(iface);
     LONG ref = InterlockedIncrement(&This->ref);

-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);

return ref;
 }
@@ -3577,7 +3577,7 @@ static ULONG WINAPI propschema_Release(IMimePropertySchema *iface)
     propschema *This = impl_from_IMimePropertySchema(iface);
     LONG ref = InterlockedDecrement(&This->ref);

-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);

if (!ref)
     {
@@ -3591,7 +3591,7 @@ static HRESULT WINAPI propschema_RegisterProperty(IMimePropertySchema *iface, co
         DWORD rownumber, VARTYPE vtdefault, DWORD *propid)
 {
     propschema *This = impl_from_IMimePropertySchema(iface);
-    FIXME("(%p)->(%s, %x, %d, %d, %p) stub\n", This, debugstr_a(name), flags, rownumber, vtdefault, propid);
+    FIXME("(%p)->(%s, %lx, %ld, %d, %p) stub\n", This, debugstr_a(name), flags, rownumber, vtdefault, propid);
     return E_NOTIMPL;
 }

@@ -3599,7 +3599,7 @@ static HRESULT WINAPI propschema_ModifyProperty(IMimePropertySchema *iface, cons
         DWORD rownumber, VARTYPE vtdefault)
 {
     propschema *This = impl_from_IMimePropertySchema(iface);
-    FIXME("(%p)->(%s, %x, %d, %d) stub\n", This, debugstr_a(name), flags, rownumber, vtdefault);
+    FIXME("(%p)->(%s, %lx, %ld, %d) stub\n", This, debugstr_a(name), flags, rownumber, vtdefault);
     return S_OK;
 }

@@ -3613,7 +3613,7 @@ static HRESULT WINAPI propschema_GetPropertyId(IMimePropertySchema *iface, const
 static HRESULT WINAPI propschema_GetPropertyName(IMimePropertySchema *iface, DWORD propid, char **name)
 {
     propschema *This = impl_from_IMimePropertySchema(iface);
-    FIXME("(%p)->(%d, %p) stub\n", This, propid, name);
+    FIXME("(%p)->(%ld, %p) stub\n", This, propid, name);
     return E_NOTIMPL;
 }

@@ -3658,7 +3658,7 @@ HRESULT WINAPI MimeOleGetPropertySchema(IMimePropertySchema **schema)
 HRESULT WINAPI MimeGetAddressFormatW(REFIID riid, void *object, DWORD addr_type,
        ADDRESSFORMAT addr_format, WCHAR **address)
 {
-    FIXME("(%s, %p, %d, %d, %p) stub\n", debugstr_guid(riid), object, addr_type, addr_format, address);
+    FIXME("(%s, %p, %ld, %d, %p) stub\n", debugstr_guid(riid), object, addr_type, addr_format, address);

return E_NOTIMPL;
 }
diff --git a/dlls/inetcomm/pop3transport.c b/dlls/inetcomm/pop3transport.c
index 053a23a1ed2..7901b831cb5 100644
--- a/dlls/inetcomm/pop3transport.c
+++ b/dlls/inetcomm/pop3transport.c
@@ -96,7 +96,7 @@ static HRESULT parse_uidl_response(POP3Transport *This, POP3UIDL *uidl)
             if ((p = strchr(This->ptr, ' ')))
             {
                 while (*p == ' ') p++;
-                sscanf(p, "%u", &uidl->dwPopId);
+                sscanf(p, "%lu", &uidl->dwPopId);
                 if ((p = strchr(p, ' ')))
                 {
                     while (*p == ' ') p++;
@@ -117,7 +117,7 @@ static HRESULT parse_uidl_response(POP3Transport *This, POP3UIDL *uidl)
             This->state = STATE_DONE;
             return S_OK;
         }
-        sscanf(This->response, "%u", &uidl->dwPopId);
+        sscanf(This->response, "%lu", &uidl->dwPopId);
         if ((p = strchr(This->response, ' ')))
         {
             while (*p == ' ') p++;
@@ -145,7 +145,7 @@ static HRESULT parse_stat_response(POP3Transport *This, POP3STAT *stat)
         if ((p = strchr(This->ptr, ' ')))
         {
             while (*p == ' ') p++;
-            sscanf(p, "%u %u", &stat->cMessages, &stat->cbMessages);
+            sscanf(p, "%lu %lu", &stat->cMessages, &stat->cbMessages);
             This->valid_info = TRUE;
             This->state = STATE_DONE;
             return S_OK;
@@ -172,7 +172,7 @@ static HRESULT parse_list_response(POP3Transport *This, POP3LIST *list)
             if ((p = strchr(This->ptr, ' ')))
             {
                 while (*p == ' ') p++;
-                sscanf(p, "%u %u", &list->dwPopId, &list->cbSize);
+                sscanf(p, "%lu %lu", &list->dwPopId, &list->cbSize);
                 This->valid_info = TRUE;
             }
             This->state = STATE_DONE;
@@ -188,11 +188,11 @@ static HRESULT parse_list_response(POP3Transport *This, POP3LIST *list)
             This->state = STATE_DONE;
             return S_OK;
         }
-        sscanf(This->response, "%u", &list->dwPopId);
+        sscanf(This->response, "%lu", &list->dwPopId);
         if ((p = strchr(This->response, ' ')))
         {
             while (*p == ' ') p++;
-            sscanf(p, "%u", &list->cbSize);
+            sscanf(p, "%lu", &list->cbSize);
             This->valid_info = TRUE;
             return S_OK;
         }
@@ -858,7 +858,7 @@ static HRESULT WINAPI POP3Transport_InitNew(IPOP3Transport *iface,
 static HRESULT WINAPI POP3Transport_MarkItem(IPOP3Transport *iface, POP3MARKTYPE marktype,
     DWORD dwPopId, boolean fMarked)
 {
-    FIXME("(%u, %u, %d)\n", marktype, dwPopId, fMarked);
+    FIXME("(%u, %lu, %d)\n", marktype, dwPopId, fMarked);
     return E_NOTIMPL;
 }

@@ -917,13 +917,13 @@ static HRESULT WINAPI POP3Transport_CommandPASS(IPOP3Transport *iface, LPSTR pas
 static HRESULT WINAPI POP3Transport_CommandLIST(
     IPOP3Transport *iface, POP3CMDTYPE cmdtype, DWORD dwPopId)
 {
-    static const char list[] = "LIST %u\r\n";
+    static const char list[] = "LIST %lu\r\n";
     static char list_all[] = "LIST\r\n";
     POP3Transport *This = (POP3Transport *)iface;
     char *command;
     int len;

-    TRACE("(%u, %u)\n", cmdtype, dwPopId);
+    TRACE("(%u, %lu)\n", cmdtype, dwPopId);

if (dwPopId)
     {
@@ -944,12 +944,12 @@ static HRESULT WINAPI POP3Transport_CommandLIST(
 static HRESULT WINAPI POP3Transport_CommandTOP(
     IPOP3Transport *iface, POP3CMDTYPE cmdtype, DWORD dwPopId, DWORD cPreviewLines)
 {
-    static const char top[] = "TOP %u %u\r\n";
+    static const char top[] = "TOP %lu %lu\r\n";
     POP3Transport *This = (POP3Transport *)iface;
     char *command;
     int len;

-    TRACE("(%u, %u, %u)\n", cmdtype, dwPopId, cPreviewLines);
+    TRACE("(%u, %lu, %lu)\n", cmdtype, dwPopId, cPreviewLines);

len = sizeof(top) + 20 + 2; /* 2 * "4294967296" + "\r\n" */
     if (!(command = HeapAlloc(GetProcessHeap(), 0, len))) return S_FALSE;
@@ -1016,13 +1016,13 @@ static HRESULT WINAPI POP3Transport_CommandRSET(IPOP3Transport *iface)
 static HRESULT WINAPI POP3Transport_CommandUIDL(
     IPOP3Transport *iface, POP3CMDTYPE cmdtype, DWORD dwPopId)
 {
-    static const char uidl[] = "UIDL %u\r\n";
+    static const char uidl[] = "UIDL %lu\r\n";
     static char uidl_all[] = "UIDL\r\n";
     POP3Transport *This = (POP3Transport *)iface;
     char *command;
     int len;

-    TRACE("(%u, %u)\n", cmdtype, dwPopId);
+    TRACE("(%u, %lu)\n", cmdtype, dwPopId);

if (dwPopId)
     {
@@ -1043,12 +1043,12 @@ static HRESULT WINAPI POP3Transport_CommandUIDL(
 static HRESULT WINAPI POP3Transport_CommandDELE(
     IPOP3Transport *iface, POP3CMDTYPE cmdtype, DWORD dwPopId)
 {
-    static const char dele[] = "DELE %u\r\n";
+    static const char dele[] = "DELE %lu\r\n";
     POP3Transport *This = (POP3Transport *)iface;
     char *command;
     int len;

-    TRACE("(%u, %u)\n", cmdtype, dwPopId);
+    TRACE("(%u, %lu)\n", cmdtype, dwPopId);

len = sizeof(dele) + 10 + 2; /* "4294967296" + "\r\n" */
     if (!(command = HeapAlloc(GetProcessHeap(), 0, len))) return S_FALSE;
@@ -1065,12 +1065,12 @@ static HRESULT WINAPI POP3Transport_CommandDELE(
 static HRESULT WINAPI POP3Transport_CommandRETR(
     IPOP3Transport *iface, POP3CMDTYPE cmdtype, DWORD dwPopId)
 {
-    static const char retr[] = "RETR %u\r\n";
+    static const char retr[] = "RETR %lu\r\n";
     POP3Transport *This = (POP3Transport *)iface;
     char *command;
     int len;

-    TRACE("(%u, %u)\n", cmdtype, dwPopId);
+    TRACE("(%u, %lu)\n", cmdtype, dwPopId);

len = sizeof(retr) + 10 + 2; /* "4294967296" + "\r\n" */
     if (!(command = HeapAlloc(GetProcessHeap(), 0, len))) return S_FALSE;
diff --git a/dlls/inetcomm/protocol.c b/dlls/inetcomm/protocol.c
index 620d171e737..5cb0d53d253 100644
--- a/dlls/inetcomm/protocol.c
+++ b/dlls/inetcomm/protocol.c
@@ -230,7 +230,7 @@ static ULONG WINAPI BindStatusCallback_AddRef(IBindStatusCallback *iface)
     MimeHtmlBinding *This = impl_from_IBindStatusCallback(iface);
     LONG ref = InterlockedIncrement(&This->ref);

-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);

return ref;
 }
@@ -240,7 +240,7 @@ static ULONG WINAPI BindStatusCallback_Release(IBindStatusCallback *iface)
     MimeHtmlBinding *This = impl_from_IBindStatusCallback(iface);
     LONG ref = InterlockedDecrement(&This->ref);

-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);

if(!ref) {
         if(This->protocol)
@@ -258,7 +258,7 @@ static HRESULT WINAPI BindStatusCallback_OnStartBinding(IBindStatusCallback *ifa
 {
     MimeHtmlBinding *This = impl_from_IBindStatusCallback(iface);

-    TRACE("(%p)->(%x %p)\n", This, dwReserved, pib);
+    TRACE("(%p)->(%lx %p)\n", This, dwReserved, pib);

assert(!This->stream);
     return CreateStreamOnHGlobal(NULL, TRUE, &This->stream);
@@ -278,7 +278,7 @@ static HRESULT WINAPI BindStatusCallback_OnProgress(IBindStatusCallback *iface,
         ULONG ulProgressMax, ULONG ulStatusCode, LPCWSTR szStatusText)
 {
     MimeHtmlBinding *This = impl_from_IBindStatusCallback(iface);
-    TRACE("(%p)->(%u/%u %u %s)\n", This, ulProgress, ulProgressMax, ulStatusCode, debugstr_w(szStatusText));
+    TRACE("(%p)->(%lu/%lu %lu %s)\n", This, ulProgress, ulProgressMax, ulStatusCode, debugstr_w(szStatusText));
     return S_OK;
 }

@@ -287,7 +287,7 @@ static HRESULT WINAPI BindStatusCallback_OnStopBinding(IBindStatusCallback *ifac
     MimeHtmlBinding *This = impl_from_IBindStatusCallback(iface);
     IMimeMessage *mime_message = NULL;

-    TRACE("(%p)->(%x %s)\n", This, hresult, debugstr_w(szError));
+    TRACE("(%p)->(%lx %s)\n", This, hresult, debugstr_w(szError));

if(SUCCEEDED(hresult)) {
         hresult = load_mime_message(This->stream, &mime_message);
@@ -402,7 +402,7 @@ static ULONG WINAPI MimeHtmlProtocol_AddRef(IUnknown *iface)
     MimeHtmlProtocol *This = impl_from_IUnknown(iface);
     ULONG ref = InterlockedIncrement(&This->ref);

-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);

return ref;
 }
@@ -412,7 +412,7 @@ static ULONG WINAPI MimeHtmlProtocol_Release(IUnknown *iface)
     MimeHtmlProtocol *This = impl_from_IUnknown(iface);
     ULONG ref = InterlockedDecrement(&This->ref);

-    TRACE("(%p) ref=%x\n", This, ref);
+    TRACE("(%p) ref=%lx\n", This, ref);

if(!ref) {
         if(This->sink)
@@ -469,7 +469,7 @@ static HRESULT WINAPI MimeHtmlProtocol_Start(IInternetProtocol *iface, const WCH
     IMoniker *mon;
     HRESULT hres;

-    TRACE("(%p)->(%s %p %p %08x %lx)\n", This, debugstr_w(szUrl), pOIProtSink, pOIBindInfo, grfPI, dwReserved);
+    TRACE("(%p)->(%s %p %p %08lx %Ix)\n", This, debugstr_w(szUrl), pOIProtSink, pOIBindInfo, grfPI, dwReserved);

hres = parse_mhtml_url(szUrl, &url);
     if(FAILED(hres))
@@ -480,11 +480,11 @@ static HRESULT WINAPI MimeHtmlProtocol_Start(IInternetProtocol *iface, const WCH

hres = IInternetBindInfo_GetBindInfo(pOIBindInfo, &bindf, &bindinfo);
     if(FAILED(hres)) {
-        WARN("GetBindInfo failed: %08x\n", hres);
+        WARN("GetBindInfo failed: %08lx\n", hres);
         return hres;
     }
     if((bindf & (BINDF_ASYNCHRONOUS|BINDF_FROMURLMON|BINDF_NEEDFILE)) != (BINDF_ASYNCHRONOUS|BINDF_FROMURLMON|BINDF_NEEDFILE))
-        FIXME("unsupported bindf %x\n", bindf);
+        FIXME("unsupported bindf %lx\n", bindf);

IInternetProtocolSink_AddRef(This->sink = pOIProtSink);

@@ -538,14 +538,14 @@ static HRESULT WINAPI MimeHtmlProtocol_Continue(IInternetProtocol *iface, PROTOC
 static HRESULT WINAPI MimeHtmlProtocol_Abort(IInternetProtocol *iface, HRESULT hrReason, DWORD dwOptions)
 {
     MimeHtmlProtocol *This = impl_from_IInternetProtocol(iface);
-    FIXME("(%p)->(%08x %08x)\n", This, hrReason, dwOptions);
+    FIXME("(%p)->(%08lx %08lx)\n", This, hrReason, dwOptions);
     return E_NOTIMPL;
 }

static HRESULT WINAPI MimeHtmlProtocol_Terminate(IInternetProtocol *iface, DWORD dwOptions)
 {
     MimeHtmlProtocol *This = impl_from_IInternetProtocol(iface);
-    TRACE("(%p)->(%08x)\n", This, dwOptions);
+    TRACE("(%p)->(%08lx)\n", This, dwOptions);
     return S_OK;
 }

@@ -569,7 +569,7 @@ static HRESULT WINAPI MimeHtmlProtocol_Read(IInternetProtocol *iface, void* pv,
     ULONG read = 0;
     HRESULT hres;

-    TRACE("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead);
+    TRACE("(%p)->(%p %lu %p)\n", This, pv, cb, pcbRead);

hres = IStream_Read(This->stream, pv, cb, &read);
     if(pcbRead)
@@ -584,14 +584,14 @@ static HRESULT WINAPI MimeHtmlProtocol_Seek(IInternetProtocol *iface, LARGE_INTE
         DWORD dwOrigin, ULARGE_INTEGER* plibNewPosition)
 {
     MimeHtmlProtocol *This = impl_from_IInternetProtocol(iface);
-    FIXME("(%p)->(%d %d %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition);
+    FIXME("(%p)->(%ld %ld %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition);
     return E_NOTIMPL;
 }

static HRESULT WINAPI MimeHtmlProtocol_LockRequest(IInternetProtocol *iface, DWORD dwOptions)
 {
     MimeHtmlProtocol *This = impl_from_IInternetProtocol(iface);
-    FIXME("(%p)->(%d)\n", This, dwOptions);
+    FIXME("(%p)->(%ld)\n", This, dwOptions);
     return S_OK;
 }

@@ -646,7 +646,7 @@ static HRESULT WINAPI MimeHtmlProtocolInfo_ParseUrl(IInternetProtocolInfo *iface
         DWORD* pcchResult, DWORD dwReserved)
 {
     MimeHtmlProtocol *This = impl_from_IInternetProtocolInfo(iface);
-    FIXME("(%p)->(%s %d %x %p %d %p %d)\n", This, debugstr_w(pwzUrl), ParseAction,
+    FIXME("(%p)->(%s %d %lx %p %ld %p %ld)\n", This, debugstr_w(pwzUrl), ParseAction,
           dwParseFlags, pwzResult, cchResult, pcchResult, dwReserved);
     return INET_E_DEFAULT_ACTION;
 }
@@ -661,7 +661,7 @@ static HRESULT WINAPI MimeHtmlProtocolInfo_CombineUrl(IInternetProtocolInfo *ifa
     WCHAR *p;
     HRESULT hres;

-    TRACE("(%p)->(%s %s %08x %p %d %p %d)\n", This, debugstr_w(pwzBaseUrl),
+    TRACE("(%p)->(%s %s %08lx %p %ld %p %ld)\n", This, debugstr_w(pwzBaseUrl),
           debugstr_w(pwzRelativeUrl), dwCombineFlags, pwzResult, cchResult,
           pcchResult, dwReserved);

@@ -701,7 +701,7 @@ static HRESULT WINAPI MimeHtmlProtocolInfo_CompareUrl(IInternetProtocolInfo *ifa
         LPCWSTR pwzUrl2, DWORD dwCompareFlags)
 {
     MimeHtmlProtocol *This = impl_from_IInternetProtocolInfo(iface);
-    FIXME("(%p)->(%s %s %08x)\n", This, debugstr_w(pwzUrl1), debugstr_w(pwzUrl2), dwCompareFlags);
+    FIXME("(%p)->(%s %s %08lx)\n", This, debugstr_w(pwzUrl1), debugstr_w(pwzUrl2), dwCompareFlags);
     return E_NOTIMPL;
 }

@@ -710,7 +710,7 @@ static HRESULT WINAPI MimeHtmlProtocolInfo_QueryInfo(IInternetProtocolInfo *ifac
         DWORD dwReserved)
 {
     MimeHtmlProtocol *This = impl_from_IInternetProtocolInfo(iface);
-    FIXME("(%p)->(%s %08x %08x %p %d %p %d)\n", This, debugstr_w(pwzUrl), QueryOption, dwQueryFlags, pBuffer,
+    FIXME("(%p)->(%s %08x %08lx %p %ld %p %ld)\n", This, debugstr_w(pwzUrl), QueryOption, dwQueryFlags, pBuffer,
           cbBuffer, pcbBuf, dwReserved);
     return INET_E_USE_DEFAULT_PROTOCOLHANDLER;
 }
diff --git a/dlls/inetcomm/smtptransport.c b/dlls/inetcomm/smtptransport.c
index d71061ed6b2..88659c4541c 100644
--- a/dlls/inetcomm/smtptransport.c
+++ b/dlls/inetcomm/smtptransport.c
@@ -478,7 +478,7 @@ static void SMTPTransport_CallbackMessageSendTo(IInternetTransport *iface, char

for (; This->ulCurrentAddressIndex < This->pending_message.rAddressList.cAddress; This->ulCurrentAddressIndex++)
     {
-        TRACE("address[%d]: %s\n", This->ulCurrentAddressIndex,
+        TRACE("address[%ld]: %s\n", This->ulCurrentAddressIndex,
             This->pending_message.rAddressList.prgAddress[This->ulCurrentAddressIndex].szEmail);

if ((This->pending_message.rAddressList.prgAddress[This->ulCurrentAddressIndex].addrtype & ADDR_TOFROM_MASK) == ADDR_TO)
@@ -685,13 +685,13 @@ static HRESULT WINAPI SMTPTransport_SendMessage(ISMTPTransport2 *iface,
     {
         if ((pMessage->rAddressList.prgAddress[i].addrtype & ADDR_TOFROM_MASK) == ADDR_FROM)
         {
-            TRACE("address[%d]: ADDR_FROM, %s\n", i,
+            TRACE("address[%ld]: ADDR_FROM, %s\n", i,
                 pMessage->rAddressList.prgAddress[i].szEmail);
             pszFromAddress = pMessage->rAddressList.prgAddress[i].szEmail;
         }
         else if ((pMessage->rAddressList.prgAddress[i].addrtype & ADDR_TOFROM_MASK) == ADDR_TO)
         {
-            TRACE("address[%d]: ADDR_TO, %s\n", i,
+            TRACE("address[%ld]: ADDR_TO, %s\n", i,
                 pMessage->rAddressList.prgAddress[i].szEmail);
         }
     }
@@ -891,7 +891,7 @@ static HRESULT WINAPI SMTPTransport_CommandDOT(ISMTPTransport2 *iface)
 static HRESULT WINAPI SMTPTransport_SendDataStream(ISMTPTransport2 *iface,
     IStream *pStream, ULONG cbSize)
 {
-    FIXME("(%p, %d)\n", pStream, cbSize);
+    FIXME("(%p, %ld)\n", pStream, cbSize);
     return E_NOTIMPL;
 }

[PATCH 08/23] dlls/inetcpl.cpl: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech

---
 dlls/inetcpl.cpl/Makefile.in   |    1 -
 dlls/inetcpl.cpl/connections.c |    6 +++---
 dlls/inetcpl.cpl/content.c     |    4 ++--
 dlls/inetcpl.cpl/general.c     |    8 ++++----
 dlls/inetcpl.cpl/inetcpl.c     |    6 +++---
 dlls/inetcpl.cpl/security.c    |   30 +++++++++++++++---------------
 6 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/dlls/inetcpl.cpl/Makefile.in b/dlls/inetcpl.cpl/Makefile.in
index 40e416eec2c..6f6df61dfa3 100644
--- a/dlls/inetcpl.cpl/Makefile.in
+++ b/dlls/inetcpl.cpl/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = inetcpl.cpl
 IMPORTS   = comctl32 shlwapi user32 advapi32
 DELAYIMPORTS = cryptui wininet ole32 urlmon shell32
diff --git a/dlls/inetcpl.cpl/connections.c b/dlls/inetcpl.cpl/connections.c
index d33c0bf3a19..c14002ea256 100644
--- a/dlls/inetcpl.cpl/connections.c
+++ b/dlls/inetcpl.cpl/connections.c
@@ -166,14 +166,14 @@ static void connections_on_initdialog(HWND hwnd)
         if(!res && type == REG_BINARY)
         {
             if(settings->version != CONNECTION_SETTINGS_VERSION)
-                FIXME("unexpected structure version (%x)\n", settings->version);
+                FIXME("unexpected structure version (%lx)\n", settings->version);
             else if(settings->flags & CONNECTION_SETTINGS_WPAD)
                 CheckDlgButton(hwnd, IDC_USE_WPAD, BST_CHECKED);
         }
         heap_free(settings);
     }

-    TRACE("ProxyEnable = %x\n", enabled);
+    TRACE("ProxyEnable = %lx\n", enabled);
     TRACE("ProxyServer = %s\n", wine_dbgstr_w(address));
     TRACE("AutoConfigURL = %s\n", wine_dbgstr_w(pac_url));

@@ -262,7 +262,7 @@ static INT_PTR connections_on_notify(HWND hwnd, WPARAM wparam, LPARAM lparam)
         RegCloseKey(hkey);
         return FALSE;
     }
-    TRACE("ProxyEnable set to %x\n", use_proxy);
+    TRACE("ProxyEnable set to %lx\n", use_proxy);

proxy_len = GetDlgItemTextW(hwnd, IDC_EDIT_PROXY_SERVER, proxy, ARRAY_SIZE(proxy));
     if(proxy_len)
diff --git a/dlls/inetcpl.cpl/content.c b/dlls/inetcpl.cpl/content.c
index d71c8b2326a..06535cbf97a 100644
--- a/dlls/inetcpl.cpl/content.c
+++ b/dlls/inetcpl.cpl/content.c
@@ -40,7 +40,7 @@ static BOOL display_cert_manager(HWND parent, DWORD flags)
 {
     CRYPTUI_CERT_MGR_STRUCT dlg;

-    TRACE("(%p, 0x%x)\n", parent, flags);
+    TRACE("(%p, 0x%lx)\n", parent, flags);

ZeroMemory(&dlg, sizeof(CRYPTUI_CERT_MGR_STRUCT));
     dlg.dwSize = sizeof(CRYPTUI_CERT_MGR_STRUCT);
@@ -78,7 +78,7 @@ BOOL WINAPI LaunchSiteCertDialog(HWND parent)
 INT_PTR CALLBACK content_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
 {
     if ((msg != WM_SETCURSOR) && (msg != WM_NCHITTEST) && (msg != WM_MOUSEMOVE))
-        TRACE("(%p, 0x%08x/%d, 0x%lx, 0x%lx)\n", hwnd, msg, msg, wparam, lparam);
+        TRACE("(%p, 0x%08x/%d, 0x%Ix, 0x%Ix)\n", hwnd, msg, msg, wparam, lparam);

if (msg == WM_COMMAND)
     {
diff --git a/dlls/inetcpl.cpl/general.c b/dlls/inetcpl.cpl/general.c
index 53e2d1d4fca..516689bcdab 100644
--- a/dlls/inetcpl.cpl/general.c
+++ b/dlls/inetcpl.cpl/general.c
@@ -155,7 +155,7 @@ static DWORD parse_url_from_outside(LPCWSTR url, LPWSTR out, DWORD maxlen)
         return res;
     }

-    ERR("failed to get ordinal 170: %d\n", GetLastError());
+    ERR("failed to get ordinal 170: %ld\n", GetLastError());
     FreeLibrary(hdll);
     return 0;
 }
@@ -252,7 +252,7 @@ static INT_PTR general_on_notify(HWND hwnd, WPARAM wparam, LPARAM lparam)
     LONG res;

psn = (PSHNOTIFY *) lparam;
-    TRACE("WM_NOTIFY (%p, 0x%lx, 0x%lx) from %p with code: %d\n", hwnd, wparam, lparam,
+    TRACE("WM_NOTIFY (%p, 0x%Ix, 0x%Ix) from %p with code: %d\n", hwnd, wparam, lparam,
             psn->hdr.hwndFrom, psn->hdr.code);

if (psn->hdr.code == PSN_APPLY)
@@ -262,7 +262,7 @@ static INT_PTR general_on_notify(HWND hwnd, WPARAM wparam, LPARAM lparam)
         TRACE("EDITTEXT has %s\n", debugstr_w(buffer));

res = parse_url_from_outside(buffer, parsed, ARRAY_SIZE(parsed));
-        TRACE("got %d with %s\n", res, debugstr_w(parsed));
+        TRACE("got %ld with %s\n", res, debugstr_w(parsed));

if (res)
         {
@@ -310,7 +310,7 @@ INT_PTR CALLBACK general_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpar
             if ((msg == WM_SETCURSOR) || (msg == WM_NCHITTEST) || (msg == WM_MOUSEMOVE))
                 return FALSE;

-            TRACE("(%p, 0x%08x/%d, 0x%lx, 0x%lx)\n", hwnd, msg, msg, wparam, lparam);
+            TRACE("(%p, 0x%08x/%d, 0x%Ix, 0x%Ix)\n", hwnd, msg, msg, wparam, lparam);

}
     return FALSE;
diff --git a/dlls/inetcpl.cpl/inetcpl.c b/dlls/inetcpl.cpl/inetcpl.c
index b4dbe848677..a2feccb3eb1 100644
--- a/dlls/inetcpl.cpl/inetcpl.c
+++ b/dlls/inetcpl.cpl/inetcpl.c
@@ -46,7 +46,7 @@ DECLSPEC_HIDDEN HMODULE hcpl;
  */
 BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved)
 {
-    TRACE("(%p, %d, %p)\n", hdll, reason, reserved);
+    TRACE("(%p, %ld, %p)\n", hdll, reason, reserved);

switch (reason)
     {
@@ -73,7 +73,7 @@ HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline)
 static int CALLBACK propsheet_callback(HWND hwnd, UINT msg, LPARAM lparam)
 {

-    TRACE("(%p, 0x%08x/%d, 0x%lx)\n", hwnd, msg, msg, lparam);
+    TRACE("(%p, 0x%08x/%d, 0x%Ix)\n", hwnd, msg, msg, lparam);
     switch (msg)
     {
         case PSCB_INITIALIZED:
@@ -164,7 +164,7 @@ static void display_cpl_sheets(HWND parent)
  */
 LONG CALLBACK CPlApplet(HWND hWnd, UINT command, LPARAM lParam1, LPARAM lParam2)
 {
-    TRACE("(%p, %u, 0x%lx, 0x%lx)\n", hWnd, command, lParam1, lParam2);
+    TRACE("(%p, %u, 0x%Ix, 0x%Ix)\n", hWnd, command, lParam1, lParam2);

switch (command)
     {
diff --git a/dlls/inetcpl.cpl/security.c b/dlls/inetcpl.cpl/security.c
index 4c60c42ca0e..a6e8c03d505 100644
--- a/dlls/inetcpl.cpl/security.c
+++ b/dlls/inetcpl.cpl/security.c
@@ -82,7 +82,7 @@ static DWORD index_from_urltemplate(URLTEMPLATE value)
     if (!index && value)
         FIXME("URLTEMPLATE 0x%x not supported\n", value);

-    TRACE("URLTEMPLATE 0x%08x=> Level %d\n", value, index);
+    TRACE("URLTEMPLATE 0x%08x=> Level %ld\n", value, index);
     return index;
 }

@@ -95,7 +95,7 @@ static void update_security_level(secdlg_data *sd, DWORD lv_index, DWORD tb_inde
     WCHAR name[512];
     DWORD current_index;

-    TRACE("(%p, lv_index: %u, tb_index: %u)\n", sd, lv_index, tb_index);
+    TRACE("(%p, lv_index: %lu, tb_index: %lu)\n", sd, lv_index, tb_index);

if ((sd->levels[lv_index] != sd->last_level) || (tb_index > 0)) {
         /* show or hide the trackbar */
@@ -106,7 +106,7 @@ static void update_security_level(secdlg_data *sd, DWORD lv_index, DWORD tb_inde

name[0] = 0;
         LoadStringW(hcpl, IDS_SEC_LEVEL0 + current_index, name, ARRAY_SIZE(name));
-        TRACE("new level #%d: %s\n", current_index, debugstr_w(name));
+        TRACE("new level #%ld: %s\n", current_index, debugstr_w(name));
         SetWindowTextW(GetDlgItem(sd->hsec, IDC_SEC_LEVEL), name);

name[0] = 0;
@@ -159,7 +159,7 @@ static void add_zone_to_listview(secdlg_data *sd, DWORD *pindex, DWORD zone)
     WCHAR * ptr;
     HICON icon;

-    TRACE("item %d (zone %d)\n", lv_index, zone);
+    TRACE("item %ld (zone %ld)\n", lv_index, zone);

sd->zones[lv_index] = zone;

@@ -170,11 +170,11 @@ static void add_zone_to_listview(secdlg_data *sd, DWORD *pindex, DWORD zone)
     if (SUCCEEDED(hr)) {
         TRACE("displayname: %s\n", debugstr_w(za->szDisplayName));
         TRACE("description: %s\n", debugstr_w(za->szDescription));
-        TRACE("minlevel: 0x%x, recommended: 0x%x, current: 0x%x (flags: 0x%x)\n", za->dwTemplateMinLevel,
+        TRACE("minlevel: 0x%lx, recommended: 0x%lx, current: 0x%lx (flags: 0x%lx)\n", za->dwTemplateMinLevel,
              za->dwTemplateRecommended, za->dwTemplateCurrentLevel, za->dwFlags);

if (za->dwFlags & ZAFLAGS_NO_UI ) {
-            TRACE("item %d (zone %d): UI disabled for %s\n", lv_index, zone, debugstr_w(za->szDisplayName));
+            TRACE("item %ld (zone %ld): UI disabled for %s\n", lv_index, zone, debugstr_w(za->szDisplayName));
             return;
         }

@@ -199,7 +199,7 @@ static void add_zone_to_listview(secdlg_data *sd, DWORD *pindex, DWORD zone)
                               GetSystemMetrics(SM_CYICON), LR_SHARED);

if (!icon) {
-                FIXME("item %d (zone %d): missing icon #%d in %s\n", lv_index, zone, iconid, debugstr_w(za->szIconPath));
+                FIXME("item %ld (zone %ld): missing icon #%d in %s\n", lv_index, zone, iconid, debugstr_w(za->szIconPath));
             }

/* the failure result (NULL) from LoadImageW let ImageList_AddIcon fail
@@ -207,7 +207,7 @@ static void add_zone_to_listview(secdlg_data *sd, DWORD *pindex, DWORD zone)
             lvitem.iImage = ImageList_AddIcon(sd->himages, icon);
         }
         else
-            FIXME("item %d (zone %d): malformed szIconPath %s\n", lv_index, zone, debugstr_w(za->szIconPath));
+            FIXME("item %ld (zone %ld): malformed szIconPath %s\n", lv_index, zone, debugstr_w(za->szIconPath));

if (ListView_InsertItemW(sd->hlv, &lvitem) >= 0) {
             /* activate first item in the listview */
@@ -223,7 +223,7 @@ static void add_zone_to_listview(secdlg_data *sd, DWORD *pindex, DWORD zone)
         FreeLibrary(hdll);
     }
     else
-        FIXME("item %d (zone %d): GetZoneAttributes failed with 0x%x\n", lv_index, zone, hr);
+        FIXME("item %ld (zone %ld): GetZoneAttributes failed with 0x%lx\n", lv_index, zone, hr);
 }

/*********************************************************************
@@ -330,12 +330,12 @@ static INT_PTR security_on_initdialog(HWND hsec)

hr = security_enum_zones(sd);
     if (FAILED(hr)) {
-        ERR("got 0x%x\n", hr);
+        ERR("got 0x%lx\n", hr);
         security_on_destroy(sd);
         return FALSE;
     }

-    TRACE("found %d zones\n", sd->num_zones);
+    TRACE("found %ld zones\n", sd->num_zones);

/* remember ZONEATTRIBUTES for a listview entry */
     sd->zone_attr = heap_alloc(sizeof(ZONEATTRIBUTES) * sd->num_zones);
@@ -384,7 +384,7 @@ static INT_PTR security_on_notify(secdlg_data *sd, WPARAM wparam, LPARAM lparam)
     switch (nm->hdr.code)
     {
         case LVN_ITEMCHANGED:
-            TRACE("LVN_ITEMCHANGED (0x%lx, 0x%lx) from %p with code: %d (item: %d, uNewState: %u)\n",
+            TRACE("LVN_ITEMCHANGED (0x%Ix, 0x%Ix) from %p with code: %d (item: %d, uNewState: %u)\n",
                     wparam, lparam, nm->hdr.hwndFrom, nm->hdr.code, nm->iItem, nm->uNewState);
             if ((nm->uNewState & LVIS_SELECTED) == LVIS_SELECTED) {
                 update_zone_info(sd, nm->iItem);
@@ -392,12 +392,12 @@ static INT_PTR security_on_notify(secdlg_data *sd, WPARAM wparam, LPARAM lparam)
             break;

case PSN_APPLY:
-            TRACE("PSN_APPLY (0x%lx, 0x%lx) from %p with code: %d\n", wparam, lparam,
+            TRACE("PSN_APPLY (0x%Ix, 0x%Ix) from %p with code: %d\n", wparam, lparam,
                     nm->hdr.hwndFrom, nm->hdr.code);
             break;

default:
-            TRACE("WM_NOTIFY (0x%lx, 0x%lx) from %p with code: %d\n", wparam, lparam,
+            TRACE("WM_NOTIFY (0x%Ix, 0x%Ix) from %p with code: %d\n", wparam, lparam,
                     nm->hdr.hwndFrom, nm->hdr.code);

}
@@ -432,7 +432,7 @@ INT_PTR CALLBACK security_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpa
                     (msg == WM_MOUSEMOVE) || (msg == WM_MOUSEACTIVATE) || (msg == WM_PARENTNOTIFY))
                     return FALSE;

-                TRACE("(%p, 0x%08x/%03d, 0x%08lx, 0x%08lx)\n", hwnd, msg, msg, wparam, lparam);
+                TRACE("(%p, 0x%08x/%03d, 0x%08Ix, 0x%08Ix)\n", hwnd, msg, msg, wparam, lparam);
         }
     }
     return FALSE;

[PATCH 09/23] dlls/inetmib1: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech

---
 dlls/inetmib1/Makefile.in |    1 -
 dlls/inetmib1/main.c      |    4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/inetmib1/Makefile.in b/dlls/inetmib1/Makefile.in
index 5bfdf5fe769..25391ff2624 100644
--- a/dlls/inetmib1/Makefile.in
+++ b/dlls/inetmib1/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = inetmib1.dll
 IMPORTS   = snmpapi
 DELAYIMPORTS = iphlpapi
diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c
index 31dc4d5e8e2..90da277375e 100644
--- a/dlls/inetmib1/main.c
+++ b/dlls/inetmib1/main.c
@@ -1318,7 +1318,7 @@ BOOL WINAPI SnmpExtensionInit(DWORD dwUptimeReference,
     AsnObjectIdentifier myOid = DEFINE_OID(mib2System);
     UINT i;

-    TRACE("(%d, %p, %p)\n", dwUptimeReference, phSubagentTrapEvent,
+    TRACE("(%ld, %p, %p)\n", dwUptimeReference, phSubagentTrapEvent,
         pFirstSupportedRegion);

minSupportedIDLength = UINT_MAX;
@@ -1447,7 +1447,7 @@ BOOL WINAPI SnmpExtensionQuery(BYTE bPduType, SnmpVarBindList *pVarBindList,
  */
 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
-    TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved);
+    TRACE("(0x%p, %ld, %p)\n", hinstDLL, fdwReason, lpvReserved);

switch (fdwReason)
     {

[PATCH 10/23] dlls/infosoft: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech

---
 dlls/infosoft/Makefile.in   |    1 -
 dlls/infosoft/wordbreaker.c |    4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/infosoft/Makefile.in b/dlls/infosoft/Makefile.in
index 2e7b3b4762d..d70e2fa52fe 100644
--- a/dlls/infosoft/Makefile.in
+++ b/dlls/infosoft/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = infosoft.dll
 IMPORTS   = uuid advapi32

diff --git a/dlls/infosoft/wordbreaker.c b/dlls/infosoft/wordbreaker.c
index aa432eb6bc4..0b29a6eb2d1 100644
--- a/dlls/infosoft/wordbreaker.c
+++ b/dlls/infosoft/wordbreaker.c
@@ -84,7 +84,7 @@ static ULONG WINAPI wb_Release(IWordBreaker *iface)
 static HRESULT WINAPI wb_Init( IWordBreaker *iface,
         BOOL fQuery, ULONG ulMaxTokenSize, BOOL *pfLicense )
 {
-    TRACE("%d %u\n", fQuery, ulMaxTokenSize);
+    TRACE("%d %lu\n", fQuery, ulMaxTokenSize);
     *pfLicense = FALSE;
     return S_OK;
 }
@@ -158,7 +158,7 @@ static HRESULT WINAPI wb_ComposePhrase( IWordBreaker *iface,
          const WCHAR *pwcModifier, ULONG cwcModifier,
          ULONG ulAttachmentType, WCHAR *pwcPhrase, ULONG *pcwcPhrase)
 {
-    FIXME("%p %u %p %u %u %p %p\n", pwcNoun, cwcNoun,
+    FIXME("%p %lu %p %lu %lu %p %p\n", pwcNoun, cwcNoun,
           pwcModifier, cwcModifier, ulAttachmentType, pwcPhrase, pcwcPhrase);
     return S_OK;
 }

[PATCH 11/23] dlls/inseng: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech

---
 dlls/inseng/Makefile.in   |    1 -
 dlls/inseng/inseng_main.c |   14 +++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/dlls/inseng/Makefile.in b/dlls/inseng/Makefile.in
index f4b1d4b915f..0217203791a 100644
--- a/dlls/inseng/Makefile.in
+++ b/dlls/inseng/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = inseng.dll
 IMPORTS   = uuid ole32 advapi32

diff --git a/dlls/inseng/inseng_main.c b/dlls/inseng/inseng_main.c
index 2c95a2e72bd..c72a12955b8 100644
--- a/dlls/inseng/inseng_main.c
+++ b/dlls/inseng/inseng_main.c
@@ -74,7 +74,7 @@ static ULONG WINAPI InstallEngine_AddRef(IInstallEngine2 *iface)
     InstallEngine *This = impl_from_IInstallEngine2(iface);
     LONG ref = InterlockedIncrement(&This->ref);

-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);

return ref;
 }
@@ -84,7 +84,7 @@ static ULONG WINAPI InstallEngine_Release(IInstallEngine2 *iface)
     InstallEngine *This = impl_from_IInstallEngine2(iface);
     LONG ref = InterlockedDecrement(&This->ref);

-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);

if(!ref)
         heap_free(This);
@@ -109,14 +109,14 @@ static HRESULT WINAPI InstallEngine_SetCifFile(IInstallEngine2 *iface, const cha
 static HRESULT WINAPI InstallEngine_DownloadComponents(IInstallEngine2 *iface, DWORD flags)
 {
     InstallEngine *This = impl_from_IInstallEngine2(iface);
-    FIXME("(%p)->(%x)\n", This, flags);
+    FIXME("(%p)->(%lx)\n", This, flags);
     return E_NOTIMPL;
 }

static HRESULT WINAPI InstallEngine_InstallComponents(IInstallEngine2 *iface, DWORD flags)
 {
     InstallEngine *This = impl_from_IInstallEngine2(iface);
-    FIXME("(%p)->(%x)\n", This, flags);
+    FIXME("(%p)->(%lx)\n", This, flags);
     return E_NOTIMPL;
 }

@@ -158,7 +158,7 @@ static HRESULT WINAPI InstallEngine_UnregisterInstallEngineCallback(IInstallEngi
 static HRESULT WINAPI InstallEngine_SetAction(IInstallEngine2 *iface, const char *id, DWORD action, DWORD priority)
 {
     InstallEngine *This = impl_from_IInstallEngine2(iface);
-    FIXME("(%p)->(%s %d %d)\n", This, debugstr_a(id), action, priority);
+    FIXME("(%p)->(%s %ld %ld)\n", This, debugstr_a(id), action, priority);
     return E_NOTIMPL;
 }

@@ -207,7 +207,7 @@ static HRESULT WINAPI InstallEngine_SetInstallDrive(IInstallEngine2 *iface, char
 static HRESULT WINAPI InstallEngine_SetInstallOptions(IInstallEngine2 *iface, DWORD flags)
 {
     InstallEngine *This = impl_from_IInstallEngine2(iface);
-    FIXME("(%p)->(%x)\n", This, flags);
+    FIXME("(%p)->(%lx)\n", This, flags);
     return E_NOTIMPL;
 }

@@ -228,7 +228,7 @@ static HRESULT WINAPI InstallEngine_SetIStream(IInstallEngine2 *iface, IStream *
 static HRESULT WINAPI InstallEngine_Abort(IInstallEngine2 *iface, DWORD flags)
 {
     InstallEngine *This = impl_from_IInstallEngine2(iface);
-    FIXME("(%p)->(%x)\n", This, flags);
+    FIXME("(%p)->(%lx)\n", This, flags);
     return E_NOTIMPL;
 }

[PATCH 12/23] dlls/iphlpapi: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech

---
 dlls/iphlpapi/Makefile.in     |    1 
 dlls/iphlpapi/iphlpapi_main.c |   84 +++++++++++++++++++++--------------------
 2 files changed, 42 insertions(+), 43 deletions(-)

diff --git a/dlls/iphlpapi/Makefile.in b/dlls/iphlpapi/Makefile.in
index 7119450e76c..d01c764c61f 100644
--- a/dlls/iphlpapi/Makefile.in
+++ b/dlls/iphlpapi/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = iphlpapi.dll
 IMPORTLIB = iphlpapi
 IMPORTS   = advapi32 dnsapi nsi uuid
diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c
index f96a5dc5fd1..53b5006d771 100644
--- a/dlls/iphlpapi/iphlpapi_main.c
+++ b/dlls/iphlpapi/iphlpapi_main.c
@@ -214,7 +214,7 @@ DWORD WINAPI CreateIpNetEntry(PMIB_IPNETROW pArpEntry)
  */
 DWORD WINAPI CreateProxyArpEntry(DWORD dwAddress, DWORD dwMask, DWORD dwIfIndex)
 {
-  FIXME("(dwAddress 0x%08x, dwMask 0x%08x, dwIfIndex 0x%08x): stub\n",
+  FIXME("(dwAddress 0x%08lx, dwMask 0x%08lx, dwIfIndex 0x%08lx): stub\n",
    dwAddress, dwMask, dwIfIndex);
   return ERROR_NOT_SUPPORTED;
 }
@@ -307,7 +307,7 @@ DWORD WINAPI CreateSortedAddressPairs( const PSOCKADDR_IN6 src_list, DWORD src_c
     SOCKADDR_IN addr4;
     MIB_IPADDRTABLE *table;

-    FIXME( "(src_list %p src_count %u dst_list %p dst_count %u options %x pair_list %p pair_count %p): stub\n",
+    FIXME( "(src_list %p src_count %lu dst_list %p dst_count %lu options %lx pair_list %p pair_count %p): stub\n",
            src_list, src_count, dst_list, dst_count, options, pair_list, pair_count );

if (src_list || src_count || !dst_list || !pair_list || !pair_count || dst_count > 500)
@@ -373,7 +373,7 @@ DWORD WINAPI CreateSortedAddressPairs( const PSOCKADDR_IN6 src_list, DWORD src_c
  */
 DWORD WINAPI DeleteIPAddress(ULONG NTEContext)
 {
-  FIXME("(NTEContext %d): stub\n", NTEContext);
+  FIXME("(NTEContext %ld): stub\n", NTEContext);
   return ERROR_NOT_SUPPORTED;
 }

@@ -443,7 +443,7 @@ DWORD WINAPI DeleteIpNetEntry(PMIB_IPNETROW pArpEntry)
  */
 DWORD WINAPI DeleteProxyArpEntry(DWORD dwAddress, DWORD dwMask, DWORD dwIfIndex)
 {
-  FIXME("(dwAddress 0x%08x, dwMask 0x%08x, dwIfIndex 0x%08x): stub\n",
+  FIXME("(dwAddress 0x%08lx, dwMask 0x%08lx, dwIfIndex 0x%08lx): stub\n",
    dwAddress, dwMask, dwIfIndex);
   return ERROR_NOT_SUPPORTED;
 }
@@ -492,7 +492,7 @@ DWORD WINAPI EnableRouter(HANDLE * pHandle, OVERLAPPED * pOverlapped)
  */
 DWORD WINAPI FlushIpNetTable(DWORD dwIfIndex)
 {
-  FIXME("(dwIfIndex 0x%08x): stub\n", dwIfIndex);
+  FIXME("(dwIfIndex 0x%08lx): stub\n", dwIfIndex);
   /* this flushes the arp cache of the given index */
   return ERROR_NOT_SUPPORTED;
 }
@@ -1288,7 +1288,7 @@ ULONG WINAPI DECLSPEC_HOTPATCH GetAdaptersAddresses( ULONG family, ULONG flags,
     IP_ADAPTER_ADDRESSES *info;
     DWORD err, needed;

-    TRACE( "(%d, %08x, %p, %p, %p)\n", family, flags, reserved, aa, size );
+    TRACE( "(%ld, %08lx, %p, %p, %p)\n", family, flags, reserved, aa, size );

if (!size) return ERROR_INVALID_PARAMETER;

@@ -1362,7 +1362,7 @@ DWORD WINAPI GetBestInterfaceEx(struct sockaddr *pDestAddr, PDWORD pdwBestIfInde
       ret = ERROR_NOT_SUPPORTED;
     }
   }
-  TRACE("returning %d\n", ret);
+  TRACE("returning %ld\n", ret);
   return ret;
 }

@@ -1386,7 +1386,7 @@ DWORD WINAPI GetBestRoute(DWORD dwDestAddr, DWORD dwSourceAddr, PMIB_IPFORWARDRO
   PMIB_IPFORWARDTABLE table;
   DWORD ret;

-  TRACE("dwDestAddr 0x%08x, dwSourceAddr 0x%08x, pBestRoute %p\n", dwDestAddr,
+  TRACE("dwDestAddr 0x%08lx, dwSourceAddr 0x%08lx, pBestRoute %p\n", dwDestAddr,
    dwSourceAddr, pBestRoute);
   if (!pBestRoute)
     return ERROR_INVALID_PARAMETER;
@@ -1423,7 +1423,7 @@ DWORD WINAPI GetBestRoute(DWORD dwDestAddr, DWORD dwSourceAddr, PMIB_IPFORWARDRO
     }
     HeapFree(GetProcessHeap(), 0, table);
   }
-  TRACE("returning %d\n", ret);
+  TRACE("returning %ld\n", ret);
   return ret;
 }

@@ -1446,7 +1446,7 @@ DWORD WINAPI GetFriendlyIfIndex(DWORD IfIndex)
   /* windows doesn't validate these, either, just makes sure the top byte is
      cleared.  I assume my ifenum module never gives an index with the top
      byte set. */
-  TRACE("returning %d\n", IfIndex);
+  TRACE("returning %ld\n", IfIndex);
   return IfIndex;
 }

@@ -2008,7 +2008,7 @@ DWORD WINAPI AllocateAndGetIpAddrTableFromStack( MIB_IPADDRTABLE **table, BOOL s
 {
     DWORD err, size = FIELD_OFFSET(MIB_IPADDRTABLE, table[2]), attempt;

-    TRACE( "table %p, sort %d, heap %p, flags 0x%08x\n", table, sort, heap, flags );
+    TRACE( "table %p, sort %d, heap %p, flags 0x%08lx\n", table, sort, heap, flags );

for (attempt = 0; attempt < 5; attempt++)
     {
@@ -2141,7 +2141,7 @@ DWORD WINAPI AllocateAndGetIpForwardTableFromStack( MIB_IPFORWARDTABLE **table,
 {
     DWORD err, size = FIELD_OFFSET(MIB_IPFORWARDTABLE, table[2]), attempt;

-    TRACE( "table %p, sort %d, heap %p, flags 0x%08x\n", table, sort, heap, flags );
+    TRACE( "table %p, sort %d, heap %p, flags 0x%08lx\n", table, sort, heap, flags );

for (attempt = 0; attempt < 5; attempt++)
     {
@@ -2369,7 +2369,7 @@ DWORD WINAPI AllocateAndGetIpNetTableFromStack( MIB_IPNETTABLE **table, BOOL sor
 {
     DWORD err, size = FIELD_OFFSET(MIB_IPNETTABLE, table[2]), attempt;

-    TRACE( "table %p, sort %d, heap %p, flags 0x%08x\n", table, sort, heap, flags );
+    TRACE( "table %p, sort %d, heap %p, flags 0x%08lx\n", table, sort, heap, flags );

for (attempt = 0; attempt < 5; attempt++)
     {
@@ -2520,7 +2520,7 @@ DWORD WINAPI GetIpStatisticsEx( MIB_IPSTATS *stats, DWORD family )
     const NPI_MODULEID *mod;
     DWORD err, cmpt = 1;

-    TRACE( "%p %d\n", stats, family );
+    TRACE( "%p %ld\n", stats, family );

if (!stats) return ERROR_INVALID_PARAMETER;
     mod = ip_module_id( family );
@@ -2726,7 +2726,7 @@ DWORD WINAPI GetPerAdapterInfo( ULONG index, IP_PER_ADAPTER_INFO *info, ULONG *s
     DWORD needed = sizeof(*info), dns_size;
     NET_LUID luid;

-    TRACE( "(index %d, info %p, size %p)\n", index, info, size );
+    TRACE( "(index %ld, info %p, size %p)\n", index, info, size );

if (!size) return ERROR_INVALID_PARAMETER;
     if (ConvertInterfaceIndexToLuid( index, &luid )) return ERROR_NO_DATA;
@@ -2770,7 +2770,7 @@ DWORD WINAPI GetPerAdapterInfo( ULONG index, IP_PER_ADAPTER_INFO *info, ULONG *s
  */
 BOOL WINAPI GetRTTAndHopCount(IPAddr DestIpAddress, PULONG HopCount, ULONG MaxHops, PULONG RTT)
 {
-  FIXME("(DestIpAddress 0x%08x, HopCount %p, MaxHops %d, RTT %p): stub\n",
+  FIXME("(DestIpAddress 0x%08lx, HopCount %p, MaxHops %ld, RTT %p): stub\n",
    DestIpAddress, HopCount, MaxHops, RTT);
   return FALSE;
 }
@@ -2861,7 +2861,7 @@ static DWORD tcp_table_id( ULONG table_class )
         return NSI_TCP_ALL_TABLE;

default:
-        ERR( "unhandled class %u\n", table_class );
+        ERR( "unhandled class %lu\n", table_class );
         return ~0u;
     }
 }
@@ -2897,7 +2897,7 @@ static DWORD tcp_table_size( ULONG family, ULONG table_class, DWORD row_count, D
             FIELD_OFFSET(MIB_TCP6TABLE2, table[row_count]);

default:
-        ERR( "unhandled class %u\n", table_class );
+        ERR( "unhandled class %lu\n", table_class );
         return 0;
     }
 }
@@ -2964,7 +2964,7 @@ static void tcp_row_fill( void *table, DWORD num, ULONG family, ULONG table_clas
             return;
         }
         default:
-            ERR( "Unknown class %d\n", table_class );
+            ERR( "Unknown class %ld\n", table_class );
             return;
         }
     }
@@ -3034,11 +3034,11 @@ static void tcp_row_fill( void *table, DWORD num, ULONG family, ULONG table_clas
             return;
         }
         default:
-            ERR( "Unknown class %d\n", table_class );
+            ERR( "Unknown class %ld\n", table_class );
             return;
         }
     }
-    ERR( "Unknown family %d\n", family );
+    ERR( "Unknown family %ld\n", family );
 }

static int tcp_row_cmp( const void *a, const void *b )
@@ -3146,7 +3146,7 @@ static DWORD get_extended_tcp_table( void *table, DWORD *size, BOOL sort, ULONG
 DWORD WINAPI GetExtendedTcpTable( void *table, DWORD *size, BOOL sort, ULONG family,
                                   TCP_TABLE_CLASS table_class, ULONG reserved )
 {
-    TRACE( "table %p, size %p, sort %d, family %u, class %u, reserved %u\n",
+    TRACE( "table %p, size %p, sort %d, family %lu, class %u, reserved %lu\n",
            table, size, sort, family, table_class, reserved );

if (!ip_module_id( family )) return ERROR_INVALID_PARAMETER;
@@ -3231,7 +3231,7 @@ static DWORD allocate_tcp_table( void **table, BOOL sort, HANDLE heap, DWORD fla
  */
 DWORD WINAPI AllocateAndGetTcpTableFromStack( MIB_TCPTABLE **table, BOOL sort, HANDLE heap, DWORD flags )
 {
-    TRACE( "table %p, sort %d, heap %p, flags 0x%08x\n", table, sort, heap, flags );
+    TRACE( "table %p, sort %d, heap %p, flags 0x%08lx\n", table, sort, heap, flags );

if (!table) return ERROR_INVALID_PARAMETER;

@@ -3243,7 +3243,7 @@ DWORD WINAPI AllocateAndGetTcpTableFromStack( MIB_TCPTABLE **table, BOOL sort, H
  */
 DWORD WINAPI AllocateAndGetTcpExTableFromStack( void **table, BOOL sort, HANDLE heap, DWORD flags, DWORD family )
 {
-    TRACE( "table %p, sort %d, heap %p, flags 0x%08x, family %u\n", table, sort, heap, flags, family );
+    TRACE( "table %p, sort %d, heap %p, flags 0x%08lx, family %lu\n", table, sort, heap, flags, family );

if (!table || !ip_module_id( family )) return ERROR_INVALID_PARAMETER;
     if (family == AF_INET6) return ERROR_NOT_SUPPORTED;
@@ -3342,7 +3342,7 @@ static DWORD udp_table_size( ULONG family, ULONG table_class, DWORD row_count, D
             FIELD_OFFSET(MIB_UDP6TABLE_OWNER_MODULE, table[row_count]);

default:
-        ERR( "unhandled class %u\n", table_class );
+        ERR( "unhandled class %lu\n", table_class );
         return 0;
     }
 }
@@ -3383,7 +3383,7 @@ static void udp_row_fill( void *table, DWORD num, ULONG family, ULONG table_clas
             return;
         }
         default:
-            ERR( "Unknown class %d\n", table_class );
+            ERR( "Unknown class %ld\n", table_class );
             return;
         }
     }
@@ -3422,11 +3422,11 @@ static void udp_row_fill( void *table, DWORD num, ULONG family, ULONG table_clas
             return;
         }
         default:
-            ERR( "Unknown class %d\n", table_class );
+            ERR( "Unknown class %ld\n", table_class );
             return;
         }
     }
-    ERR( "Unknown family %d\n", family );
+    ERR( "Unknown family %ld\n", family );
     return;
 }

@@ -3461,7 +3461,7 @@ DWORD WINAPI GetExtendedUdpTable( void *table, DWORD *size, BOOL sort, ULONG fam
     struct nsi_udp_endpoint_key *key;
     struct nsi_udp_endpoint_static *stat;

-    TRACE( "table %p, size %p, sort %d, family %u, table_class %u, reserved %u\n",
+    TRACE( "table %p, size %p, sort %d, family %lu, table_class %u, reserved %lu\n",
            table, size, sort, family, table_class, reserved );

if (!size || !ip_module_id( family )) return ERROR_INVALID_PARAMETER;
@@ -3511,7 +3511,7 @@ DWORD WINAPI AllocateAndGetUdpTableFromStack( MIB_UDPTABLE **table, BOOL sort, H
 {
     DWORD err, size = 0x100, attempt;

-    TRACE("table %p, sort %d, heap %p, flags 0x%08x\n", table, sort, heap, flags );
+    TRACE("table %p, sort %d, heap %p, flags 0x%08lx\n", table, sort, heap, flags );

if (!table) return ERROR_INVALID_PARAMETER;

@@ -3852,7 +3852,7 @@ DWORD WINAPI NotifyUnicastIpAddressChange(ADDRESS_FAMILY family, PUNICAST_IPADDR
  */
 DWORD WINAPI SendARP(IPAddr DestIP, IPAddr SrcIP, PULONG pMacAddr, PULONG PhyAddrLen)
 {
-  FIXME("(DestIP 0x%08x, SrcIP 0x%08x, pMacAddr %p, PhyAddrLen %p): stub\n",
+  FIXME("(DestIP 0x%08lx, SrcIP 0x%08lx, pMacAddr %p, PhyAddrLen %p): stub\n",
    DestIP, SrcIP, pMacAddr, PhyAddrLen);
   return ERROR_NOT_SUPPORTED;
 }
@@ -4005,7 +4005,7 @@ DWORD WINAPI SetTcpEntry(PMIB_TCPROW pTcpRow)
 DWORD WINAPI SetPerTcpConnectionEStats(PMIB_TCPROW row, TCP_ESTATS_TYPE state, PBYTE rw,
                                        ULONG version, ULONG size, ULONG offset)
 {
-  FIXME("(row %p, state %d, rw %p, version %u, size %u, offset %u): stub\n",
+  FIXME("(row %p, state %d, rw %p, version %lu, size %lu, offset %lu): stub\n",
         row, state, rw, version, size, offset);
   return ERROR_NOT_SUPPORTED;
 }
@@ -4044,7 +4044,7 @@ DWORD WINAPI UnenableRouter(OVERLAPPED * pOverlapped, LPDWORD lpdwEnableCount)
 DWORD WINAPI PfCreateInterface(DWORD dwName, PFFORWARD_ACTION inAction, PFFORWARD_ACTION outAction,
         BOOL bUseLog, BOOL bMustBeUnique, INTERFACE_HANDLE *ppInterface)
 {
-    FIXME("(%d %d %d %x %x %p) stub\n", dwName, inAction, outAction, bUseLog, bMustBeUnique, ppInterface);
+    FIXME("(%ld %d %d %x %x %p) stub\n", dwName, inAction, outAction, bUseLog, bMustBeUnique, ppInterface);
     return ERROR_CALL_NOT_IMPLEMENTED;
 }

@@ -4147,7 +4147,7 @@ DWORD WINAPI ConvertInterfaceIndexToLuid(NET_IFINDEX index, NET_LUID *luid)
 {
     DWORD err;

-    TRACE( "(%u %p)\n", index, luid );
+    TRACE( "(%lu %p)\n", index, luid );

if (!luid) return ERROR_INVALID_PARAMETER;

@@ -4165,7 +4165,7 @@ DWORD WINAPI ConvertInterfaceLuidToAlias( const NET_LUID *luid, WCHAR *alias, SI
     DWORD err;
     IF_COUNTED_STRING name;

-    TRACE( "(%p %p %u)\n", luid, alias, (DWORD)len );
+    TRACE( "(%p %p %lu)\n", luid, alias, (DWORD)len );

if (!luid || !alias) return ERROR_INVALID_PARAMETER;

@@ -4225,7 +4225,7 @@ DWORD WINAPI ConvertInterfaceLuidToNameA(const NET_LUID *luid, char *name, SIZE_
     DWORD err;
     WCHAR nameW[IF_MAX_STRING_SIZE + 1];

-    TRACE( "(%p %p %u)\n", luid, name, (DWORD)len );
+    TRACE( "(%p %p %lu)\n", luid, name, (DWORD)len );

if (!luid) return ERROR_INVALID_PARAMETER;
     if (!name || !len) return ERROR_NOT_ENOUGH_MEMORY;
@@ -4265,7 +4265,7 @@ DWORD WINAPI ConvertInterfaceLuidToNameW(const NET_LUID *luid, WCHAR *name, SIZE
     const WCHAR *prefix = NULL;
     WCHAR buf[IF_MAX_STRING_SIZE + 1];

-    TRACE( "(%p %p %u)\n", luid, name, (DWORD)len );
+    TRACE( "(%p %p %lu)\n", luid, name, (DWORD)len );

if (!luid || !name) return ERROR_INVALID_PARAMETER;

@@ -4389,7 +4389,7 @@ char *WINAPI IPHLP_if_indextoname( NET_IFINDEX index, char *name )
     NET_LUID luid;
     DWORD err;

-    TRACE( "(%u, %p)\n", index, name );
+    TRACE( "(%lu, %p)\n", index, name );

err = ConvertInterfaceIndexToLuid( index, &luid );
     if (err) return NULL;
@@ -4419,7 +4419,7 @@ DWORD WINAPI GetBestRoute2(NET_LUID *luid, NET_IFINDEX index,
     static int once;

if (!once++)
-        FIXME("(%p, %d, %p, %p, 0x%08x, %p, %p): stub\n", luid, index, source,
+        FIXME("(%p, %ld, %p, %p, 0x%08lx, %p, %p): stub\n", luid, index, source,
                 destination, options, bestroute, bestaddress);

if (!destination || !bestroute || !bestaddress)
@@ -4440,7 +4440,7 @@ DWORD WINAPI ParseNetworkString(const WCHAR *str, DWORD type,
     USHORT temp_port = 0;
     NTSTATUS status;

-    TRACE("(%s, %d, %p, %p, %p)\n", debugstr_w(str), type, info, port, prefix_len);
+    TRACE("(%s, %ld, %p, %p, %p)\n", debugstr_w(str), type, info, port, prefix_len);

if (!str)
         return ERROR_INVALID_PARAMETER;
@@ -4516,7 +4516,7 @@ DWORD WINAPI ParseNetworkString(const WCHAR *str, DWORD type,

if (type & ~(NET_STRING_IPV4_ADDRESS|NET_STRING_IPV4_SERVICE|NET_STRING_IPV6_ADDRESS|NET_STRING_IPV6_SERVICE))
     {
-        FIXME("Unimplemented type 0x%x\n", type);
+        FIXME("Unimplemented type 0x%lx\n", type);
         return ERROR_NOT_SUPPORTED;
     }

@@ -4686,7 +4686,7 @@ DWORD WINAPI Icmp6SendEcho2( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc_ro
                              struct sockaddr_in6 *src, struct sockaddr_in6 *dst, void *request, WORD request_size,
                              IP_OPTION_INFORMATION *opts, void *reply, DWORD reply_size, DWORD timeout )
 {
-    FIXME( "(%p, %p, %p, %p, %p, %p, %p, %d, %p, %p, %d, %d): stub\n", handle, event,
+    FIXME( "(%p, %p, %p, %p, %p, %p, %p, %d, %p, %p, %ld, %ld): stub\n", handle, event,
            apc_routine, apc_ctxt, src, dst, request, request_size, opts, reply, reply_size, timeout );
     SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
     return 0;

[PATCH 12/23] dlls/iphlpapi: enable compilation with long types

[Huw Davies]

Signed-off-by: Huw Davies

[PATCH 13/23] dlls/itss: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech

---
 dlls/itss/Makefile.in |    1 -
 dlls/itss/itss.c      |    6 +++---
 dlls/itss/protocol.c  |   30 +++++++++++++++---------------
 dlls/itss/storage.c   |   16 ++++++++--------
 4 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/dlls/itss/Makefile.in b/dlls/itss/Makefile.in
index c12ead3faec..2d34b74ed78 100644
--- a/dlls/itss/Makefile.in
+++ b/dlls/itss/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = itss.dll
 IMPORTS   = uuid urlmon shlwapi ole32

diff --git a/dlls/itss/itss.c b/dlls/itss/itss.c
index 6d41ef38c38..010c01dd586 100644
--- a/dlls/itss/itss.c
+++ b/dlls/itss/itss.c
@@ -231,7 +231,7 @@ static HRESULT WINAPI ITStorageImpl_StgCreateDocfile(
 {
     ITStorageImpl *This = impl_from_IITStorage(iface);

-    TRACE("%p %s %u %u %p\n", This,
+    TRACE("%p %s %lu %lu %p\n", This,
           debugstr_w(pwcsName), grfMode, reserved, ppstgOpen );

return ITSS_StgOpenStorage( pwcsName, NULL, grfMode,
@@ -279,7 +279,7 @@ static HRESULT WINAPI ITStorageImpl_StgOpenStorage(
 {
     ITStorageImpl *This = impl_from_IITStorage(iface);

-    TRACE("%p %s %p %d %p\n", This, debugstr_w( pwcsName ),
+    TRACE("%p %s %p %ld %p\n", This, debugstr_w( pwcsName ),
            pstgPriority, grfMode, snbExclude );

return ITSS_StgOpenStorage( pwcsName, pstgPriority, grfMode,
@@ -379,6 +379,6 @@ static HRESULT ITSS_create(IUnknown *pUnkOuter, LPVOID *ppObj)

HRESULT WINAPI DllCanUnloadNow(void)
 {
-    TRACE("dll_count = %u\n", dll_count);
+    TRACE("dll_count = %lu\n", dll_count);
     return dll_count ? S_FALSE : S_OK;
 }
diff --git a/dlls/itss/protocol.c b/dlls/itss/protocol.c
index 6d40ddf738f..cb1df3c2e1a 100644
--- a/dlls/itss/protocol.c
+++ b/dlls/itss/protocol.c
@@ -101,7 +101,7 @@ static ULONG WINAPI ITSProtocol_AddRef(IUnknown *iface)
 {
     ITSProtocol *This = impl_from_IUnknown(iface);
     LONG ref = InterlockedIncrement(&This->ref);
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
     return ref;
 }

@@ -110,7 +110,7 @@ static ULONG WINAPI ITSProtocol_Release(IUnknown *iface)
     ITSProtocol *This = impl_from_IUnknown(iface);
     LONG ref = InterlockedDecrement(&This->ref);

-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);

if(!ref) {
         release_chm(This);
@@ -231,7 +231,7 @@ static HRESULT WINAPI ITSProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl,
     int res;
     HRESULT hres;

-    TRACE("(%p)->(%s %p %p %08x %lx)\n", This, debugstr_w(szUrl), pOIProtSink,
+    TRACE("(%p)->(%s %p %p %08lx %Ix)\n", This, debugstr_w(szUrl), pOIProtSink,
             pOIBindInfo, grfPI, dwReserved);

ptr = skip_schema(szUrl);
@@ -242,7 +242,7 @@ static HRESULT WINAPI ITSProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl,
     bindinfo.cbSize = sizeof(BINDINFO);
     hres = IInternetBindInfo_GetBindInfo(pOIBindInfo, &bindf, &bindinfo);
     if(FAILED(hres)) {
-        WARN("GetBindInfo failed: %08x\n", hres);
+        WARN("GetBindInfo failed: %08lx\n", hres);
         return hres;
     }

@@ -253,7 +253,7 @@ static HRESULT WINAPI ITSProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl,
     memcpy(file_name, ptr, len*sizeof(WCHAR));
     hres = UrlUnescapeW(file_name, NULL, &len, URL_UNESCAPE_INPLACE);
     if(FAILED(hres)) {
-        WARN("UrlUnescape failed: %08x\n", hres);
+        WARN("UrlUnescape failed: %08lx\n", hres);
         HeapFree(GetProcessHeap(), 0, file_name);
         return hres;
     }
@@ -322,7 +322,7 @@ static HRESULT WINAPI ITSProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl,
             BSCF_FIRSTDATANOTIFICATION|BSCF_DATAFULLYAVAILABLE,
             chm_object.length, chm_object.length);
     if(FAILED(hres)) {
-        WARN("ReportData failed: %08x\n", hres);
+        WARN("ReportData failed: %08lx\n", hres);
         release_chm(This);
         return report_result(pOIProtSink, hres);
     }
@@ -343,7 +343,7 @@ static HRESULT WINAPI ITSProtocol_Abort(IInternetProtocol *iface, HRESULT hrReas
         DWORD dwOptions)
 {
     ITSProtocol *This = impl_from_IInternetProtocol(iface);
-    FIXME("(%p)->(%08x %08x)\n", This, hrReason, dwOptions);
+    FIXME("(%p)->(%08lx %08lx)\n", This, hrReason, dwOptions);
     return E_NOTIMPL;
 }

@@ -351,7 +351,7 @@ static HRESULT WINAPI ITSProtocol_Terminate(IInternetProtocol *iface, DWORD dwOp
 {
     ITSProtocol *This = impl_from_IInternetProtocol(iface);

-    TRACE("(%p)->(%08x)\n", This, dwOptions);
+    TRACE("(%p)->(%08lx)\n", This, dwOptions);

return S_OK;
 }
@@ -375,7 +375,7 @@ static HRESULT WINAPI ITSProtocol_Read(IInternetProtocol *iface, void *pv,
 {
     ITSProtocol *This = impl_from_IInternetProtocol(iface);

-    TRACE("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead);
+    TRACE("(%p)->(%p %lu %p)\n", This, pv, cb, pcbRead);

if(!This->chm_file)
         return INET_E_DATA_NOT_AVAILABLE;
@@ -390,7 +390,7 @@ static HRESULT WINAPI ITSProtocol_Seek(IInternetProtocol *iface, LARGE_INTEGER d
         DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition)
 {
     ITSProtocol *This = impl_from_IInternetProtocol(iface);
-    FIXME("(%p)->(%d %d %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition);
+    FIXME("(%p)->(%ld %ld %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition);
     return E_NOTIMPL;
 }

@@ -398,7 +398,7 @@ static HRESULT WINAPI ITSProtocol_LockRequest(IInternetProtocol *iface, DWORD dw
 {
     ITSProtocol *This = impl_from_IInternetProtocol(iface);

-    TRACE("(%p)->(%08x)\n", This, dwOptions);
+    TRACE("(%p)->(%08lx)\n", This, dwOptions);

return S_OK;
 }
@@ -453,7 +453,7 @@ static HRESULT WINAPI ITSProtocolInfo_ParseUrl(IInternetProtocolInfo *iface, LPC
 {
     ITSProtocol *This = impl_from_IInternetProtocolInfo(iface);

-    TRACE("(%p)->(%s %x %08x %p %d %p %d)\n", This, debugstr_w(pwzUrl), ParseAction,
+    TRACE("(%p)->(%s %x %08lx %p %ld %p %ld)\n", This, debugstr_w(pwzUrl), ParseAction,
           dwParseFlags, pwzResult, cchResult, pcchResult, dwReserved);

switch(ParseAction) {
@@ -478,7 +478,7 @@ static HRESULT WINAPI ITSProtocolInfo_CombineUrl(IInternetProtocolInfo *iface,
     LPCWSTR base_end, ptr;
     DWORD rel_len;

-    TRACE("(%p)->(%s %s %08x %p %d %p %d)\n", This, debugstr_w(pwzBaseUrl),
+    TRACE("(%p)->(%s %s %08lx %p %ld %p %ld)\n", This, debugstr_w(pwzBaseUrl),
             debugstr_w(pwzRelativeUrl), dwCombineFlags, pwzResult, cchResult,
             pcchResult, dwReserved);

@@ -520,7 +520,7 @@ static HRESULT WINAPI ITSProtocolInfo_CompareUrl(IInternetProtocolInfo *iface, L
         LPCWSTR pwzUrl2, DWORD dwCompareFlags)
 {
     ITSProtocol *This = impl_from_IInternetProtocolInfo(iface);
-    FIXME("%p)->(%s %s %08x)\n", This, debugstr_w(pwzUrl1), debugstr_w(pwzUrl2), dwCompareFlags);
+    FIXME("%p)->(%s %s %08lx)\n", This, debugstr_w(pwzUrl1), debugstr_w(pwzUrl2), dwCompareFlags);
     return E_NOTIMPL;
 }

@@ -529,7 +529,7 @@ static HRESULT WINAPI ITSProtocolInfo_QueryInfo(IInternetProtocolInfo *iface, LP
         DWORD dwReserved)
 {
     ITSProtocol *This = impl_from_IInternetProtocolInfo(iface);
-    FIXME("(%p)->(%s %08x %08x %p %d %p %d)\n", This, debugstr_w(pwzUrl), QueryOption,
+    FIXME("(%p)->(%s %08x %08lx %p %ld %p %ld)\n", This, debugstr_w(pwzUrl), QueryOption,
           dwQueryFlags, pBuffer, cbBuffer, pcbBuf, dwReserved);
     return E_NOTIMPL;
 }
diff --git a/dlls/itss/storage.c b/dlls/itss/storage.c
index ee5432d4d61..82c6b5442d9 100644
--- a/dlls/itss/storage.c
+++ b/dlls/itss/storage.c
@@ -151,7 +151,7 @@ static HRESULT WINAPI ITSS_IEnumSTATSTG_Next(
     DWORD len, n;
     struct enum_info *cur;

-    TRACE("%p %u %p %p\n", This, celt, rgelt, pceltFetched );
+    TRACE("%p %lu %p %p\n", This, celt, rgelt, pceltFetched );

cur = This->current;
     n = 0;
@@ -203,7 +203,7 @@ static HRESULT WINAPI ITSS_IEnumSTATSTG_Skip(
     DWORD n;
     struct enum_info *cur;

-    TRACE("%p %u\n", This, celt );
+    TRACE("%p %lu\n", This, celt );

cur = This->current;
     n = 0;
@@ -340,7 +340,7 @@ static HRESULT WINAPI ITSS_IStorageImpl_OpenStream(
     int r;
     WCHAR *path, *p;

-    TRACE("%p %s %p %u %u %p\n", This, debugstr_w(pwcsName),
+    TRACE("%p %s %p %lu %lu %p\n", This, debugstr_w(pwcsName),
           reserved1, grfMode, reserved2, ppstm );

len = lstrlenW( This->dir ) + lstrlenW( pwcsName ) + 1;
@@ -408,7 +408,7 @@ static HRESULT WINAPI ITSS_IStorageImpl_OpenStorage(
     WCHAR *path, *p;
     DWORD len;

-    TRACE("%p %s %p %u %p %u %p\n", This, debugstr_w(pwcsName),
+    TRACE("%p %s %p %lu %p %lu %p\n", This, debugstr_w(pwcsName),
           pstgPriority, grfMode, snbExclude, reserved, ppstg);

chmfile = chm_dup( This->chmfile );
@@ -515,7 +515,7 @@ static HRESULT WINAPI ITSS_IStorageImpl_EnumElements(
     ITSS_IStorageImpl *This = impl_from_IStorage(iface);
     IEnumSTATSTG_Impl* stgenum;

-    TRACE("%p %d %p %d %p\n", This, reserved1, reserved2, reserved3, ppenum );
+    TRACE("%p %ld %p %ld %p\n", This, reserved1, reserved2, reserved3, ppenum );

stgenum = ITSS_create_enum();
     if( !stgenum )
@@ -704,7 +704,7 @@ static HRESULT WINAPI ITSS_IStream_Read(
     IStream_Impl *This = impl_from_IStream(iface);
     ULONG count;

-    TRACE("%p %p %u %p\n", This, pv, cb, pcbRead);
+    TRACE("%p %p %lu %p\n", This, pv, cb, pcbRead);

count = chm_retrieve_object(This->stg->chmfile, 
                           &This->ui, pv, This->addr, cb);
@@ -734,7 +734,7 @@ static HRESULT WINAPI ITSS_IStream_Seek(
     IStream_Impl *This = impl_from_IStream(iface);
     LONGLONG newpos;

-    TRACE("%p %s %u %p\n", This,
+    TRACE("%p %s %lu %p\n", This,
           wine_dbgstr_longlong( dlibMove.QuadPart ), dwOrigin, plibNewPosition );

newpos = This->addr;
@@ -822,7 +822,7 @@ static HRESULT WINAPI ITSS_IStream_Stat(
 {
     IStream_Impl *This = impl_from_IStream(iface);

-    TRACE("%p %p %d\n", This, pstatstg, grfStatFlag);
+    TRACE("%p %p %ld\n", This, pstatstg, grfStatFlag);

memset( pstatstg, 0, sizeof *pstatstg );
     if( !( grfStatFlag & STATFLAG_NONAME ) )

[PATCH 14/23] dlls/joy.cpl: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech

---
 dlls/joy.cpl/Makefile.in |    1 -
 dlls/joy.cpl/main.c      |   24 ++++++++++++------------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/dlls/joy.cpl/Makefile.in b/dlls/joy.cpl/Makefile.in
index 265f9e6add8..d9b2aff3724 100644
--- a/dlls/joy.cpl/Makefile.in
+++ b/dlls/joy.cpl/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = joy.cpl
 IMPORTS   = dxguid dinput dinput8 ole32 comctl32 user32 advapi32

diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c
index 8ea3892b750..3ecef2d9aa8 100644
--- a/dlls/joy.cpl/main.c
+++ b/dlls/joy.cpl/main.c
@@ -43,7 +43,7 @@ DECLSPEC_HIDDEN HMODULE hcpl;
  */
 BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved)
 {
-    TRACE("(%p, %d, %p)\n", hdll, reason, reserved);
+    TRACE("(%p, %ld, %p)\n", hdll, reason, reserved);

switch (reason)
     {
@@ -297,7 +297,7 @@ static INT_PTR CALLBACK list_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM
     static struct JoystickData *data;
     int sel;

-    TRACE("(%p, 0x%08x/%d, 0x%lx)\n", hwnd, msg, msg, lparam);
+    TRACE("(%p, 0x%08x/%d, 0x%Ix)\n", hwnd, msg, msg, lparam);
     switch (msg)
     {
         case WM_INITDIALOG:
@@ -417,10 +417,10 @@ static INT_PTR CALLBACK list_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM
 static void dump_joy_state(DIJOYSTATE* st)
 {
     int i;
-    TRACE("Ax (% 5d,% 5d,% 5d)\n", st->lX,st->lY, st->lZ);
-    TRACE("RAx (% 5d,% 5d,% 5d)\n", st->lRx, st->lRy, st->lRz);
-    TRACE("Slider (% 5d,% 5d)\n", st->rglSlider[0], st->rglSlider[1]);
-    TRACE("Pov (% 5d,% 5d,% 5d,% 5d)\n", st->rgdwPOV[0], st->rgdwPOV[1], st->rgdwPOV[2], st->rgdwPOV[3]);
+    TRACE("Ax (% 5ld,% 5ld,% 5ld)\n", st->lX,st->lY, st->lZ);
+    TRACE("RAx (% 5ld,% 5ld,% 5ld)\n", st->lRx, st->lRy, st->lRz);
+    TRACE("Slider (% 5ld,% 5ld)\n", st->rglSlider[0], st->rglSlider[1]);
+    TRACE("Pov (% 5ld,% 5ld,% 5ld,% 5ld)\n", st->rgdwPOV[0], st->rgdwPOV[1], st->rgdwPOV[2], st->rgdwPOV[3]);

TRACE("Buttons ");
     for(i=0; i < TEST_MAX_BUTTONS; i++)
@@ -616,7 +616,7 @@ static INT_PTR CALLBACK test_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM
 {
     static HANDLE thread;
     static struct JoystickData *data;
-    TRACE("(%p, 0x%08x/%d, 0x%lx)\n", hwnd, msg, msg, lparam);
+    TRACE("(%p, 0x%08x/%d, 0x%Ix)\n", hwnd, msg, msg, lparam);

switch (msg)
     {
@@ -876,7 +876,7 @@ static BOOL CALLBACK ff_effects_callback(const DIEFFECTINFOW *pdei, void *pvRef)

if (FAILED(hr))
     {
-        FIXME("Failed to create effect with type %s, hr %#x\n", debugstr_guid(&pdei->guid), hr);
+        FIXME("Failed to create effect with type %s, hr %#lx\n", debugstr_guid(&pdei->guid), hr);
         return DIENUM_CONTINUE;
     }

@@ -903,7 +903,7 @@ static INT_PTR CALLBACK ff_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp
 {
     static HANDLE thread;
     static struct JoystickData *data;
-    TRACE("(%p, 0x%08x/%d, 0x%lx)\n", hwnd, msg, msg, lparam);
+    TRACE("(%p, 0x%08x/%d, 0x%Ix)\n", hwnd, msg, msg, lparam);

switch (msg)
     {
@@ -973,7 +973,7 @@ static INT_PTR CALLBACK ff_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp
  */
 static int CALLBACK propsheet_callback(HWND hwnd, UINT msg, LPARAM lparam)
 {
-    TRACE("(%p, 0x%08x/%d, 0x%lx)\n", hwnd, msg, msg, lparam);
+    TRACE("(%p, 0x%08x/%d, 0x%Ix)\n", hwnd, msg, msg, lparam);
     switch (msg)
     {
         case PSCB_INITIALIZED:
@@ -1060,7 +1060,7 @@ static void display_cpl_sheets(HWND parent, struct JoystickData *data)
 LONG CALLBACK CPlApplet(HWND hwnd, UINT command, LPARAM lParam1, LPARAM lParam2)
 {
     static struct JoystickData data;
-    TRACE("(%p, %u, 0x%lx, 0x%lx)\n", hwnd, command, lParam1, lParam2);
+    TRACE("(%p, %u, 0x%Ix, 0x%Ix)\n", hwnd, command, lParam1, lParam2);

switch (command)
     {
@@ -1073,7 +1073,7 @@ LONG CALLBACK CPlApplet(HWND hwnd, UINT command, LPARAM lParam1, LPARAM lParam2)

if (FAILED(hr))
             {
-                ERR("Failed to initialize DirectInput: 0x%08x\n", hr);
+                ERR("Failed to initialize DirectInput: 0x%08lx\n", hr);
                 return FALSE;
             }

[PATCH 15/23] dlls/jscript: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech

---
 dlls/jscript/Makefile.in    |    1 -
 dlls/jscript/activex.c      |    2 +-
 dlls/jscript/array.c        |    4 ++-
 dlls/jscript/dispex.c       |   56 ++++++++++++++++++++++---------------------
 dlls/jscript/engine.c       |   20 ++++++++-------
 dlls/jscript/error.c        |    2 +-
 dlls/jscript/global.c       |    2 +-
 dlls/jscript/jscript.c      |   38 +++++++++++++++--------------
 dlls/jscript/jscript_main.c |    4 ++-
 dlls/jscript/jsregexp.c     |    2 +-
 dlls/jscript/jsutils.c      |    4 ++-
 dlls/jscript/regexp.c       |    6 ++---
 dlls/jscript/string.c       |    6 ++---
 13 files changed, 73 insertions(+), 74 deletions(-)

diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in
index 45d9856035e..3e019201eb8 100644
--- a/dlls/jscript/Makefile.in
+++ b/dlls/jscript/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = jscript.dll
 IMPORTS   = oleaut32 ole32 user32 advapi32

diff --git a/dlls/jscript/activex.c b/dlls/jscript/activex.c
index 80a89b5ae89..42cb513dd64 100644
--- a/dlls/jscript/activex.c
+++ b/dlls/jscript/activex.c
@@ -156,7 +156,7 @@ static HRESULT ActiveXObject_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flag

if(ctx->safeopt != (INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER)
         && ctx->safeopt != INTERFACE_USES_DISPEX) {
-        FIXME("Unsupported safeopt %x\n", ctx->safeopt);
+        FIXME("Unsupported safeopt %lx\n", ctx->safeopt);
         return E_NOTIMPL;
     }

diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c
index 56727f905f3..6ee18090207 100644
--- a/dlls/jscript/array.c
+++ b/dlls/jscript/array.c
@@ -122,7 +122,7 @@ static HRESULT Array_set_length(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t val
     DWORD i;
     HRESULT hres;

-    TRACE("%p %d\n", This, This->length);
+    TRACE("%p %ld\n", This, This->length);

hres = to_number(ctx, value, &len);
     if(FAILED(hres))
@@ -701,7 +701,7 @@ static HRESULT Array_sort(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigne
                 vtab[i] = jsval_undefined();
                 hres = S_OK;
             } else if(FAILED(hres)) {
-                WARN("Could not get elem %d: %08x\n", i, hres);
+                WARN("Could not get elem %ld: %08lx\n", i, hres);
                 break;
             }
         }
diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c
index 5e0955330e2..f8c3b5583db 100644
--- a/dlls/jscript/dispex.c
+++ b/dlls/jscript/dispex.c
@@ -346,7 +346,7 @@ static HRESULT ensure_prop_name(jsdisp_t *This, const WCHAR *name, DWORD create_

hres = find_prop_name_prot(This, string_hash(name), name, &prop);
     if(SUCCEEDED(hres) && (!prop || prop->type == PROP_DELETED)) {
-        TRACE("creating prop %s flags %x\n", debugstr_w(name), create_flags);
+        TRACE("creating prop %s flags %lx\n", debugstr_w(name), create_flags);

if(prop) {
             prop->type = PROP_JSVAL;
@@ -467,7 +467,7 @@ static HRESULT prop_get(jsdisp_t *This, dispex_prop_t *prop,  jsval_t *r)
     }

if(FAILED(hres)) {
-        TRACE("fail %08x\n", hres);
+        TRACE("fail %08lx\n", hres);
         return hres;
     }

@@ -738,7 +738,7 @@ static ULONG WINAPI ScriptTypeInfo_AddRef(ITypeInfo *iface)
     ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface);
     LONG ref = InterlockedIncrement(&This->ref);

-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);

return ref;
 }
@@ -749,7 +749,7 @@ static ULONG WINAPI ScriptTypeInfo_Release(ITypeInfo *iface)
     LONG ref = InterlockedDecrement(&This->ref);
     UINT i;

-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);

if (!ref)
     {
@@ -870,7 +870,7 @@ static HRESULT WINAPI ScriptTypeInfo_GetNames(ITypeInfo *iface, MEMBERID memid,
     HRESULT hr;
     UINT i = 0;

-    TRACE("(%p)->(%d %p %u %p)\n", This, memid, rgBstrNames, cMaxNames, pcNames);
+    TRACE("(%p)->(%ld %p %u %p)\n", This, memid, rgBstrNames, cMaxNames, pcNames);

if (!rgBstrNames || !pcNames) return E_INVALIDARG;
     if (memid <= 0) return TYPE_E_ELEMENTNOTFOUND;
@@ -1001,7 +1001,7 @@ static HRESULT WINAPI ScriptTypeInfo_Invoke(ITypeInfo *iface, PVOID pvInstance,
     IDispatch *disp;
     HRESULT hr;

-    TRACE("(%p)->(%p %d %d %p %p %p %p)\n", This, pvInstance, memid, wFlags,
+    TRACE("(%p)->(%p %ld %d %p %p %p %p)\n", This, pvInstance, memid, wFlags,
           pDispParams, pVarResult, pExcepInfo, puArgErr);

if (!pvInstance) return E_INVALIDARG;
@@ -1035,7 +1035,7 @@ static HRESULT WINAPI ScriptTypeInfo_GetDocumentation(ITypeInfo *iface, MEMBERID
     dispex_prop_t *var;
     HRESULT hr;

-    TRACE("(%p)->(%d %p %p %p %p)\n", This, memid, pBstrName, pBstrDocString, pdwHelpContext, pBstrHelpFile);
+    TRACE("(%p)->(%ld %p %p %p %p)\n", This, memid, pBstrName, pBstrDocString, pdwHelpContext, pBstrHelpFile);

if (pBstrDocString) *pBstrDocString = NULL;
     if (pdwHelpContext) *pdwHelpContext = 0;
@@ -1086,7 +1086,7 @@ static HRESULT WINAPI ScriptTypeInfo_GetDllEntry(ITypeInfo *iface, MEMBERID memi
     ITypeInfo *disp_typeinfo;
     HRESULT hr;

-    TRACE("(%p)->(%d %d %p %p %p)\n", This, memid, invKind, pBstrDllName, pBstrName, pwOrdinal);
+    TRACE("(%p)->(%ld %d %p %p %p)\n", This, memid, invKind, pBstrDllName, pBstrName, pwOrdinal);

if (pBstrDllName) *pBstrDllName = NULL;
     if (pBstrName) *pBstrName = NULL;
@@ -1107,7 +1107,7 @@ static HRESULT WINAPI ScriptTypeInfo_GetRefTypeInfo(ITypeInfo *iface, HREFTYPE h
     ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface);
     HRESULT hr;

-    TRACE("(%p)->(%x %p)\n", This, hRefType, ppTInfo);
+    TRACE("(%p)->(%lx %p)\n", This, hRefType, ppTInfo);

if (!ppTInfo || (INT)hRefType < 0) return E_INVALIDARG;

@@ -1130,7 +1130,7 @@ static HRESULT WINAPI ScriptTypeInfo_AddressOfMember(ITypeInfo *iface, MEMBERID
     ITypeInfo *disp_typeinfo;
     HRESULT hr;

-    TRACE("(%p)->(%d %d %p)\n", This, memid, invKind, ppv);
+    TRACE("(%p)->(%ld %d %p)\n", This, memid, invKind, ppv);

if (!ppv) return E_INVALIDARG;
     *ppv = NULL;
@@ -1163,7 +1163,7 @@ static HRESULT WINAPI ScriptTypeInfo_GetMops(ITypeInfo *iface, MEMBERID memid, B
     ITypeInfo *disp_typeinfo;
     HRESULT hr;

-    TRACE("(%p)->(%d %p)\n", This, memid, pBstrMops);
+    TRACE("(%p)->(%ld %p)\n", This, memid, pBstrMops);

if (!pBstrMops) return E_INVALIDARG;

@@ -1268,7 +1268,7 @@ static HRESULT WINAPI ScriptTypeComp_Bind(ITypeComp *iface, LPOLESTR szName, ULO
     HRESULT hr;
     UINT i;

-    TRACE("(%p)->(%s %08x %d %p %p %p)\n", This, debugstr_w(szName), lHashVal,
+    TRACE("(%p)->(%s %08lx %d %p %p %p)\n", This, debugstr_w(szName), lHashVal,
           wFlags, ppTInfo, pDescKind, pBindPtr);

if (!szName || !ppTInfo || !pDescKind || !pBindPtr)
@@ -1322,7 +1322,7 @@ static HRESULT WINAPI ScriptTypeComp_BindType(ITypeComp *iface, LPOLESTR szName,
     ITypeComp *disp_typecomp;
     HRESULT hr;

-    TRACE("(%p)->(%s %08x %p %p)\n", This, debugstr_w(szName), lHashVal, ppTInfo, ppTComp);
+    TRACE("(%p)->(%s %08lx %p %p)\n", This, debugstr_w(szName), lHashVal, ppTInfo, ppTComp);

if (!szName || !ppTInfo || !ppTComp)
         return E_INVALIDARG;
@@ -1386,7 +1386,7 @@ static ULONG WINAPI DispatchEx_Release(IDispatchEx *iface)
 {
     jsdisp_t *This = impl_from_IDispatchEx(iface);
     ULONG ref = --This->ref;
-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);
     if(!ref)
         jsdisp_free(This);
     return ref;
@@ -1413,7 +1413,7 @@ static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LC
     ScriptTypeInfo *typeinfo;
     unsigned pos;

-    TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
+    TRACE("(%p)->(%u %lu %p)\n", This, iTInfo, lcid, ppTInfo);

if (iTInfo != 0) return DISP_E_BADINDEX;

@@ -1508,7 +1508,7 @@ static HRESULT WINAPI DispatchEx_GetIDsOfNames(IDispatchEx *iface, REFIID riid,
     UINT i;
     HRESULT hres;

-    TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
+    TRACE("(%p)->(%s %p %u %lu %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
           lcid, rgDispId);

if(cNames == 0)
@@ -1534,7 +1534,7 @@ static HRESULT WINAPI DispatchEx_Invoke(IDispatchEx *iface, DISPID dispIdMember,
 {
     jsdisp_t *This = impl_from_IDispatchEx(iface);

-    TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
+    TRACE("(%p)->(%ld %s %ld %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
           lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);

return IDispatchEx_InvokeEx(&This->IDispatchEx_iface, dispIdMember, lcid, wFlags,
@@ -1545,10 +1545,10 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW
 {
     jsdisp_t *This = impl_from_IDispatchEx(iface);

-    TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid);
+    TRACE("(%p)->(%s %lx %p)\n", This, debugstr_w(bstrName), grfdex, pid);

if(grfdex & ~(fdexNameCaseSensitive|fdexNameEnsure|fdexNameImplicit|FDEX_VERSION_MASK)) {
-        FIXME("Unsupported grfdex %x\n", grfdex);
+        FIXME("Unsupported grfdex %lx\n", grfdex);
         return E_NOTIMPL;
     }

@@ -1563,7 +1563,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc
     jsexcept_t ei;
     HRESULT hres;

-    TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller);
+    TRACE("(%p)->(%lx %lx %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller);

if(pvarRes)
         V_VT(pvarRes) = VT_EMPTY;
@@ -1689,10 +1689,10 @@ static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR bst
     BOOL b;
     HRESULT hres;

-    TRACE("(%p)->(%s %x)\n", This, debugstr_w(bstrName), grfdex);
+    TRACE("(%p)->(%s %lx)\n", This, debugstr_w(bstrName), grfdex);

if(grfdex & ~(fdexNameCaseSensitive|fdexNameEnsure|fdexNameImplicit|FDEX_VERSION_MASK))
-        FIXME("Unsupported grfdex %x\n", grfdex);
+        FIXME("Unsupported grfdex %lx\n", grfdex);

hres = find_prop_name(This, string_hash(bstrName), bstrName, &prop);
     if(FAILED(hres))
@@ -1711,7 +1711,7 @@ static HRESULT WINAPI DispatchEx_DeleteMemberByDispID(IDispatchEx *iface, DISPID
     dispex_prop_t *prop;
     BOOL b;

-    TRACE("(%p)->(%x)\n", This, id);
+    TRACE("(%p)->(%lx)\n", This, id);

prop = get_prop(This, id);
     if(!prop) {
@@ -1725,7 +1725,7 @@ static HRESULT WINAPI DispatchEx_DeleteMemberByDispID(IDispatchEx *iface, DISPID
 static HRESULT WINAPI DispatchEx_GetMemberProperties(IDispatchEx *iface, DISPID id, DWORD grfdexFetch, DWORD *pgrfdex)
 {
     jsdisp_t *This = impl_from_IDispatchEx(iface);
-    FIXME("(%p)->(%x %x %p)\n", This, id, grfdexFetch, pgrfdex);
+    FIXME("(%p)->(%lx %lx %p)\n", This, id, grfdexFetch, pgrfdex);
     return E_NOTIMPL;
 }

@@ -1734,7 +1734,7 @@ static HRESULT WINAPI DispatchEx_GetMemberName(IDispatchEx *iface, DISPID id, BS
     jsdisp_t *This = impl_from_IDispatchEx(iface);
     dispex_prop_t *prop;

-    TRACE("(%p)->(%x %p)\n", This, id, pbstrName);
+    TRACE("(%p)->(%lx %p)\n", This, id, pbstrName);

prop = get_prop(This, id);
     if(!prop)
@@ -1752,7 +1752,7 @@ static HRESULT WINAPI DispatchEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex,
     jsdisp_t *This = impl_from_IDispatchEx(iface);
     HRESULT hres = S_FALSE;

-    TRACE("(%p)->(%x %x %p)\n", This, grfdex, id, pid);
+    TRACE("(%p)->(%lx %lx %p)\n", This, grfdex, id, pid);

if(id != DISPID_VALUE)
         hres = jsdisp_next_prop(This, id, JSDISP_ENUM_ALL, pid);
@@ -2048,7 +2048,7 @@ static HRESULT disp_invoke(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD f
     }

if(hres == DISP_E_EXCEPTION) {
-        TRACE("DISP_E_EXCEPTION: %08x %s %s\n", ei.scode, debugstr_w(ei.bstrSource), debugstr_w(ei.bstrDescription));
+        TRACE("DISP_E_EXCEPTION: %08lx %s %s\n", ei.scode, debugstr_w(ei.bstrSource), debugstr_w(ei.bstrDescription));
         reset_ei(ctx->ei);
         ctx->ei->error = (SUCCEEDED(ei.scode) || ei.scode == DISP_E_EXCEPTION) ? E_FAIL : ei.scode;
         if(ei.bstrSource)
@@ -2608,7 +2608,7 @@ HRESULT jsdisp_define_property(jsdisp_t *obj, const WCHAR *name, property_desc_t
         return S_OK;
     }

-    TRACE("existing prop %s prop flags %x desc flags %x desc mask %x\n", debugstr_w(name),
+    TRACE("existing prop %s prop flags %lx desc flags %x desc mask %x\n", debugstr_w(name),
           prop->flags, desc->flags, desc->mask);

if(!(prop->flags & PROPF_CONFIGURABLE)) {
diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c
index ae002fc56e8..d894fbc10aa 100644
--- a/dlls/jscript/engine.c
+++ b/dlls/jscript/engine.c
@@ -837,7 +837,7 @@ static HRESULT interp_forin(script_ctx_t *ctx)
     id = get_number(stack_top(ctx));

if(!stack_topn_exprval(ctx, 1, &prop_ref)) {
-        FIXME("invalid ref: %08x\n", prop_ref.u.hres);
+        FIXME("invalid ref: %08lx\n", prop_ref.u.hres);
         return E_FAIL;
     }

@@ -992,7 +992,7 @@ static HRESULT interp_pop_scope(script_ctx_t *ctx)
     if(ctx->call_ctx->scope->ref > 1) {
         HRESULT hres = detach_variable_object(ctx, ctx->call_ctx, FALSE);
         if(FAILED(hres))
-            ERR("Failed to detach variable object: %08x\n", hres);
+            ERR("Failed to detach variable object: %08lx\n", hres);
     }

scope_pop(&ctx->call_ctx->scope);
@@ -1073,7 +1073,7 @@ static HRESULT interp_throw_ref(script_ctx_t *ctx)
 {
     const HRESULT arg = get_op_uint(ctx, 0);

-    TRACE("%08x\n", arg);
+    TRACE("%08lx\n", arg);

return arg;
 }
@@ -1084,7 +1084,7 @@ static HRESULT interp_throw_type(script_ctx_t *ctx)
     jsstr_t *str = get_op_str(ctx, 1);
     const WCHAR *ptr;

-    TRACE("%08x %s\n", hres, debugstr_jsstr(str));
+    TRACE("%08lx %s\n", hres, debugstr_jsstr(str));

ptr = jsstr_flatten(str);
     return ptr ? throw_error(ctx, hres, ptr) : E_OUTOFMEMORY;
@@ -1320,7 +1320,7 @@ static HRESULT interp_memberid(script_ctx_t *ctx)
             exprval_set_exception(&ref, JS_E_INVALID_PROPERTY);
             hres = S_OK;
         }else {
-            ERR("failed %08x\n", hres);
+            ERR("failed %08lx\n", hres);
             return hres;
         }
     }
@@ -2705,7 +2705,7 @@ static HRESULT interp_to_string(script_ctx_t *ctx)
     hres = to_string(ctx, v, &str);
     jsval_release(v);
     if(FAILED(hres)) {
-        WARN("failed %08x\n", hres);
+        WARN("failed %08lx\n", hres);
         return hres;
     }

@@ -2765,7 +2765,7 @@ static HRESULT interp_set_member(script_ctx_t *ctx)
         jsstr_release(get_string(namev));
     }
     if(FAILED(hres)) {
-        WARN("failed %08x\n", hres);
+        WARN("failed %08lx\n", hres);
         jsval_release(value);
         return hres;
     }
@@ -2913,7 +2913,7 @@ static void pop_call_frame(script_ctx_t *ctx)
     if(frame->scope && frame->scope->ref > 1) {
         HRESULT hres = detach_variable_object(ctx, frame, TRUE);
         if(FAILED(hres))
-            ERR("Failed to detach variable object: %08x\n", hres);
+            ERR("Failed to detach variable object: %08lx\n", hres);
     }

if(frame->arguments_obj)
@@ -2984,7 +2984,7 @@ static HRESULT unwind_exception(script_ctx_t *ctx, HRESULT exception_hres)
         jsdisp_t *error_obj;
         jsval_t msg;

-        WARN("Exception %08x %s", exception_hres, debugstr_jsval(ei->valid_value ? ei->value : jsval_undefined()));
+        WARN("Exception %08lx %s", exception_hres, debugstr_jsval(ei->valid_value ? ei->value : jsval_undefined()));
         if(ei->valid_value && jsval_type(ei->value) == JSV_OBJECT) {
             error_obj = to_jsdisp(get_object(ei->value));
             if(error_obj) {
@@ -3125,7 +3125,7 @@ static HRESULT bind_event_target(script_ctx_t *ctx, function_code_t *func, jsdis
         hres = IBindEventHandler_BindHandler(target, func->name, (IDispatch*)&func_obj->IDispatchEx_iface);
         IBindEventHandler_Release(target);
         if(FAILED(hres))
-            WARN("BindEvent failed: %08x\n", hres);
+            WARN("BindEvent failed: %08lx\n", hres);
     }else {
         FIXME("No IBindEventHandler, not yet supported binding\n");
     }
diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c
index 49adaeb1242..26f41fd3e57 100644
--- a/dlls/jscript/error.c
+++ b/dlls/jscript/error.c
@@ -396,7 +396,7 @@ static jsstr_t *format_error_message(HRESULT error, const WCHAR *arg)
 HRESULT throw_error(script_ctx_t *ctx, HRESULT error, const WCHAR *str)
 {
     jsexcept_t *ei = ctx->ei;
-    TRACE("%08x\n", error);
+    TRACE("%08lx\n", error);
     reset_ei(ei);
     ei->error = error;
     if(str)
diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c
index c9a00d12f6f..d425c88dea9 100644
--- a/dlls/jscript/global.c
+++ b/dlls/jscript/global.c
@@ -160,7 +160,7 @@ HRESULT JSGlobal_eval(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned a
     TRACE("parsing %s\n", debugstr_jsval(argv[0]));
     hres = compile_script(ctx, src, 0, 0, NULL, NULL, TRUE, FALSE, frame ? frame->bytecode->named_item : NULL, &code);
     if(FAILED(hres)) {
-        WARN("parse (%s) failed: %08x\n", debugstr_jsval(argv[0]), hres);
+        WARN("parse (%s) failed: %08lx\n", debugstr_jsval(argv[0]), hres);
         return hres;
     }

diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c
index 160269cc3c9..8cf141d3990 100644
--- a/dlls/jscript/jscript.c
+++ b/dlls/jscript/jscript.c
@@ -139,7 +139,7 @@ static HRESULT retrieve_named_item_disp(IActiveScriptSite *site, named_item_t *i

hr = IActiveScriptSite_GetItemInfo(site, item->name, SCRIPTINFO_IUNKNOWN, &unk, NULL);
     if(FAILED(hr)) {
-        WARN("GetItemInfo failed: %08x\n", hr);
+        WARN("GetItemInfo failed: %08lx\n", hr);
         return hr;
     }

@@ -215,7 +215,7 @@ static ULONG WINAPI JScriptError_AddRef(IActiveScriptError *iface)
     JScriptError *This = impl_from_IActiveScriptError(iface);
     LONG ref = InterlockedIncrement(&This->ref);

-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);

return ref;
 }
@@ -225,7 +225,7 @@ static ULONG WINAPI JScriptError_Release(IActiveScriptError *iface)
     JScriptError *This = impl_from_IActiveScriptError(iface);
     LONG ref = InterlockedDecrement(&This->ref);

-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);

if(!ref) {
         reset_ei(&This->ei);
@@ -355,7 +355,7 @@ HRESULT leave_script(script_ctx_t *ctx, HRESULT result)
         ei->error = result;
     }
     if(FAILED(result)) {
-        WARN("%08x\n", result);
+        WARN("%08lx\n", result);
         if(ctx->site && (error = heap_alloc(sizeof(*error)))) {
             HRESULT hres;

@@ -565,7 +565,7 @@ static ULONG WINAPI AXSite_AddRef(IServiceProvider *iface)
     AXSite *This = impl_from_IServiceProvider(iface);
     LONG ref = InterlockedIncrement(&This->ref);

-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);

return ref;
 }
@@ -575,7 +575,7 @@ static ULONG WINAPI AXSite_Release(IServiceProvider *iface)
     AXSite *This = impl_from_IServiceProvider(iface);
     LONG ref = InterlockedDecrement(&This->ref);

-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);

if(!ref)
     {
@@ -616,7 +616,7 @@ IUnknown *create_ax_site(script_ctx_t *ctx)

hres = IActiveScriptSite_QueryInterface(ctx->site, &IID_IServiceProvider, (void**)&sp);
     if(FAILED(hres)) {
-        TRACE("Could not get IServiceProvider iface: %08x\n", hres);
+        TRACE("Could not get IServiceProvider iface: %08lx\n", hres);
     }

ret = heap_alloc(sizeof(AXSite));
@@ -683,7 +683,7 @@ static ULONG WINAPI JScript_AddRef(IActiveScript *iface)
     JScript *This = impl_from_IActiveScript(iface);
     LONG ref = InterlockedIncrement(&This->ref);

-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);

return ref;
 }
@@ -693,7 +693,7 @@ static ULONG WINAPI JScript_Release(IActiveScript *iface)
     JScript *This = impl_from_IActiveScript(iface);
     LONG ref = InterlockedDecrement(&This->ref);

-    TRACE("(%p) ref=%d\n", iface, ref);
+    TRACE("(%p) ref=%ld\n", iface, ref);

if(!ref) {
         if(This->ctx && This->ctx->state != SCRIPTSTATE_CLOSED)
@@ -880,7 +880,7 @@ static HRESULT WINAPI JScript_AddNamedItem(IActiveScript *iface,
     IDispatch *disp = NULL;
     HRESULT hres;

-    TRACE("(%p)->(%s %x)\n", This, debugstr_w(pstrName), dwFlags);
+    TRACE("(%p)->(%s %lx)\n", This, debugstr_w(pstrName), dwFlags);

if(This->thread_id != GetCurrentThreadId() || !This->ctx || This->ctx->state == SCRIPTSTATE_CLOSED)
         return E_UNEXPECTED;
@@ -890,7 +890,7 @@ static HRESULT WINAPI JScript_AddNamedItem(IActiveScript *iface,

hres = IActiveScriptSite_GetItemInfo(This->site, pstrName, SCRIPTINFO_IUNKNOWN, &unk, NULL);
         if(FAILED(hres)) {
-            WARN("GetItemInfo failed: %08x\n", hres);
+            WARN("GetItemInfo failed: %08lx\n", hres);
             return hres;
         }

@@ -1064,7 +1064,7 @@ static HRESULT WINAPI JScriptParse_AddScriptlet(IActiveScriptParse *iface,
         BSTR *pbstrName, EXCEPINFO *pexcepinfo)
 {
     JScript *This = impl_from_IActiveScriptParse(iface);
-    FIXME("(%p)->(%s %s %s %s %s %s %s %u %x %p %p)\n", This, debugstr_w(pstrDefaultName),
+    FIXME("(%p)->(%s %s %s %s %s %s %s %lu %lx %p %p)\n", This, debugstr_w(pstrDefaultName),
           debugstr_w(pstrCode), debugstr_w(pstrItemName), debugstr_w(pstrSubItemName),
           debugstr_w(pstrEventName), debugstr_w(pstrDelimiter), wine_dbgstr_longlong(dwSourceContextCookie),
           ulStartingLineNumber, dwFlags, pbstrName, pexcepinfo);
@@ -1082,7 +1082,7 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface,
     jsexcept_t ei;
     HRESULT hres;

-    TRACE("(%p)->(%s %s %p %s %s %u %x %p %p)\n", This, debugstr_w(pstrCode),
+    TRACE("(%p)->(%s %s %p %s %s %lu %lx %p %p)\n", This, debugstr_w(pstrCode),
           debugstr_w(pstrItemName), punkContext, debugstr_w(pstrDelimiter),
           wine_dbgstr_longlong(dwSourceContextCookie), ulStartingLine, dwFlags, pvarResult, pexcepinfo);

@@ -1185,7 +1185,7 @@ static HRESULT WINAPI JScriptParseProcedure_ParseProcedureText(IActiveScriptPars
     jsexcept_t ei;
     HRESULT hres;

-    TRACE("(%p)->(%s %s %s %s %p %s %s %u %x %p)\n", This, debugstr_w(pstrCode), debugstr_w(pstrFormalParams),
+    TRACE("(%p)->(%s %s %s %s %p %s %s %lu %lx %p)\n", This, debugstr_w(pstrCode), debugstr_w(pstrFormalParams),
           debugstr_w(pstrProcedureName), debugstr_w(pstrItemName), punkContext, debugstr_w(pstrDelimiter),
           wine_dbgstr_longlong(dwSourceContextCookie), ulStartingLineNumber, dwFlags, ppdisp);

@@ -1249,7 +1249,7 @@ static HRESULT WINAPI JScriptProperty_GetProperty(IActiveScriptProperty *iface,
         VARIANT *pvarIndex, VARIANT *pvarValue)
 {
     JScript *This = impl_from_IActiveScriptProperty(iface);
-    FIXME("(%p)->(%x %p %p)\n", This, dwProperty, pvarIndex, pvarValue);
+    FIXME("(%p)->(%lx %p %p)\n", This, dwProperty, pvarIndex, pvarValue);
     return E_NOTIMPL;
 }

@@ -1258,7 +1258,7 @@ static HRESULT WINAPI JScriptProperty_SetProperty(IActiveScriptProperty *iface,
 {
     JScript *This = impl_from_IActiveScriptProperty(iface);

-    TRACE("(%p)->(%x %s %s)\n", This, dwProperty, debugstr_variant(pvarIndex), debugstr_variant(pvarValue));
+    TRACE("(%p)->(%lx %s %s)\n", This, dwProperty, debugstr_variant(pvarIndex), debugstr_variant(pvarValue));

if(pvarIndex)
         FIXME("unsupported pvarIndex\n");
@@ -1275,7 +1275,7 @@ static HRESULT WINAPI JScriptProperty_SetProperty(IActiveScriptProperty *iface,
         This->html_mode = (V_I4(pvarValue) & SCRIPTLANGUAGEVERSION_HTML) != 0;
         break;
     default:
-        FIXME("Unimplemented property %x\n", dwProperty);
+        FIXME("Unimplemented property %lx\n", dwProperty);
         return E_NOTIMPL;
     }

@@ -1336,7 +1336,7 @@ static HRESULT WINAPI JScriptSafety_SetInterfaceSafetyOptions(IObjectSafety *ifa
 {
     JScript *This = impl_from_IObjectSafety(iface);

-    TRACE("(%p)->(%s %x %x)\n", This, debugstr_guid(riid), dwOptionSetMask, dwEnabledOptions);
+    TRACE("(%p)->(%s %lx %lx)\n", This, debugstr_guid(riid), dwOptionSetMask, dwEnabledOptions);

if(dwOptionSetMask & ~SUPPORTED_OPTIONS)
         return E_FAIL;
@@ -1383,7 +1383,7 @@ static HRESULT WINAPI VariantChangeType_ChangeType(IVariantChangeType *iface, VA
     VARIANT res;
     HRESULT hres;

-    TRACE("(%p)->(%p %s %x %s)\n", This, dst, debugstr_variant(src), lcid, debugstr_vt(vt));
+    TRACE("(%p)->(%p %s %lx %s)\n", This, dst, debugstr_variant(src), lcid, debugstr_vt(vt));

if(!This->ctx) {
         FIXME("Object uninitialized\n");
diff --git a/dlls/jscript/jscript_main.c b/dlls/jscript/jscript_main.c
index 50ffd67521b..882c419ff83 100644
--- a/dlls/jscript/jscript_main.c
+++ b/dlls/jscript/jscript_main.c
@@ -158,7 +158,7 @@ static IClassFactory JScriptEncodeFactory = { &JScriptEncodeFactoryVtbl };
  */
 BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
 {
-    TRACE("(%p %d %p)\n", hInstDLL, fdwReason, lpv);
+    TRACE("(%p %ld %p)\n", hInstDLL, fdwReason, lpv);

switch(fdwReason) {
     case DLL_PROCESS_ATTACH:
@@ -200,7 +200,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
  */
 HRESULT WINAPI DllCanUnloadNow(void)
 {
-    TRACE("() ref=%d\n", module_ref);
+    TRACE("() ref=%ld\n", module_ref);

return module_ref ? S_FALSE : S_OK;
 }
diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c
index 0dc4aa1806c..90663d3c12c 100644
--- a/dlls/jscript/jsregexp.c
+++ b/dlls/jscript/jsregexp.c
@@ -620,7 +620,7 @@ HRESULT create_regexp(script_ctx_t *ctx, jsstr_t *src, DWORD flags, jsdisp_t **r
     if(!str)
         return E_OUTOFMEMORY;

-    TRACE("%s %x\n", debugstr_wn(str, jsstr_length(src)), flags);
+    TRACE("%s %lx\n", debugstr_wn(str, jsstr_length(src)), flags);

hres = alloc_regexp(ctx, NULL, &regexp);
     if(FAILED(hres))
diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c
index d3a41facc6c..6bc34daecd0 100644
--- a/dlls/jscript/jsutils.c
+++ b/dlls/jscript/jsutils.c
@@ -1000,7 +1000,7 @@ static ULONG WINAPI JSCaller_AddRef(IServiceProvider *iface)
     JSCaller *This = impl_from_IServiceProvider(iface);
     LONG ref = InterlockedIncrement(&This->ref);

-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);

return ref;
 }
@@ -1010,7 +1010,7 @@ static ULONG WINAPI JSCaller_Release(IServiceProvider *iface)
     JSCaller *This = impl_from_IServiceProvider(iface);
     LONG ref = InterlockedIncrement(&This->ref);

-    TRACE("(%p) ref=%d\n", This, ref);
+    TRACE("(%p) ref=%ld\n", This, ref);

if(!ref) {
         assert(!This->ctx);
diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c
index 14dd72c6bde..16f217bf32b 100644
--- a/dlls/jscript/regexp.c
+++ b/dlls/jscript/regexp.c
@@ -1935,7 +1935,7 @@ PushBackTrackState(REGlobalData *gData, REOp op,
     ptrdiff_t btincr = ((char *)result + sz) -
                        ((char *)gData->backTrackStack + btsize);

-    TRACE("\tBT_Push: %lu,%lu\n", (ULONG_PTR)parenIndex, (ULONG_PTR)parenCount);
+    TRACE("\tBT_Push: %Iu,%Iu\n", (ULONG_PTR)parenIndex, (ULONG_PTR)parenCount);

JS_COUNT_OPERATION(gData->cx, JSOW_JUMP * (1 + parenCount));
     if (btincr > 0) {
@@ -2684,7 +2684,7 @@ ExecuteREBytecode(REGlobalData *gData, match_state_t *x)

case REOP_LPAREN:
                 pc = ReadCompactIndex(pc, &parenIndex);
-                TRACE("[ %lu ]\n", (ULONG_PTR)parenIndex);
+                TRACE("[ %Iu ]\n", (ULONG_PTR)parenIndex);
                 assert(parenIndex < gData->regexp->parenCount);
                 if (parenIndex + 1 > parenSoFar)
                     parenSoFar = parenIndex + 1;
@@ -3047,7 +3047,7 @@ ExecuteREBytecode(REGlobalData *gData, match_state_t *x)
                 parenSoFar = curState->parenSoFar;
             }

-            TRACE("\tBT_Pop: %ld,%ld\n",
+            TRACE("\tBT_Pop: %Id,%Id\n",
                      (ULONG_PTR)backTrackData->parenIndex,
                      (ULONG_PTR)backTrackData->parenCount);
             continue;
diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c
index cca14cbbb95..4d65d6be959 100644
--- a/dlls/jscript/string.c
+++ b/dlls/jscript/string.c
@@ -1151,7 +1151,7 @@ static HRESULT String_split(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi
                 hres = regexp_match_next(ctx, regexp, REM_NO_PARENS, jsstr, &match_ptr);
                 if(hres != S_OK)
                     break;
-                TRACE("got match %d %d\n", (int)(match_result.cp - match_result.match_len - str), match_result.match_len);
+                TRACE("got match %d %ld\n", (int)(match_result.cp - match_result.match_len - str), match_result.match_len);
                 if(!match_result.match_len) {
                     /* If an empty string is matched, prevent including any match in the result */
                     if(!length) {
@@ -1163,7 +1163,7 @@ static HRESULT String_split(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi
                         hres = regexp_match_next(ctx, regexp, REM_NO_PARENS, jsstr, &match_ptr);
                         if(hres != S_OK)
                             break;
-                        TRACE("retried, got match %d %d\n", (int)(match_result.cp - match_result.match_len - str),
+                        TRACE("retried, got match %d %ld\n", (int)(match_result.cp - match_result.match_len - str),
                               match_result.match_len);
                     }
                     if(!match_result.match_len && match_result.cp == str + length)
@@ -1461,7 +1461,7 @@ static HRESULT String_trim(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsig

hres = to_flat_string(ctx, jsval_disp(jsthis->u.disp), &jsstr, &str);
     if(FAILED(hres)) {
-        WARN("to_flat_string failed: %08x\n", hres);
+        WARN("to_flat_string failed: %08lx\n", hres);
         return hres;
     }
     len = jsstr_length(jsstr);

[PATCH 16/23] dlls/jsproxy: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech

---
 dlls/jsproxy/Makefile.in |    1 -
 dlls/jsproxy/main.c      |    8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/dlls/jsproxy/Makefile.in b/dlls/jsproxy/Makefile.in
index 6345c9a2d74..07f1fb53bc9 100644
--- a/dlls/jsproxy/Makefile.in
+++ b/dlls/jsproxy/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = jsproxy.dll
 IMPORTS   = uuid oleaut32 ole32 ws2_32
 IMPORTLIB = jsproxy
diff --git a/dlls/jsproxy/main.c b/dlls/jsproxy/main.c
index bf8a2624920..b93d1200f42 100644
--- a/dlls/jsproxy/main.c
+++ b/dlls/jsproxy/main.c
@@ -81,7 +81,7 @@ static struct pac_script *global_script = &pac_script;
  */
 BOOL WINAPI InternetDeInitializeAutoProxyDll( LPSTR mime, DWORD reserved )
 {
-    TRACE( "%s, %u\n", debugstr_a(mime), reserved );
+    TRACE( "%s, %lu\n", debugstr_a(mime), reserved );

EnterCriticalSection( &cs_jsproxy );

@@ -127,7 +127,7 @@ BOOL WINAPI JSPROXY_InternetInitializeAutoProxyDll( DWORD version, LPSTR tmpfile
 {
     BOOL ret = FALSE;

-    TRACE( "%u, %s, %s, %p, %p\n", version, debugstr_a(tmpfile), debugstr_a(mime), callbacks, buffer );
+    TRACE( "%lu, %s, %s, %p, %p\n", version, debugstr_a(tmpfile), debugstr_a(mime), callbacks, buffer );

if (callbacks) FIXME( "callbacks not supported\n" );

@@ -538,7 +538,7 @@ static BOOL run_script( const WCHAR *script, const WCHAR *url, const WCHAR *host
     VariantClear( &args[1] );
     if (hr != S_OK)
     {
-        WARN("script failed 0x%08x\n", hr);
+        WARN("script failed 0x%08lx\n", hr);
         goto done;
     }
     if ((*result_str = strdupWA( V_BSTR( &retval ) )))
@@ -568,7 +568,7 @@ BOOL WINAPI InternetGetProxyInfo( LPCSTR url, DWORD len_url, LPCSTR hostname, DW
     WCHAR *urlW = NULL, *hostnameW = NULL;
     BOOL ret = FALSE;

-    TRACE( "%s, %u, %s, %u, %p, %p\n", debugstr_a(url), len_url, hostname, len_hostname, proxy, len_proxy );
+    TRACE( "%s, %lu, %s, %lu, %p, %p\n", debugstr_a(url), len_url, hostname, len_hostname, proxy, len_proxy );

EnterCriticalSection( &cs_jsproxy );

[PATCH 17/23] dlls/kernel32: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech

---
 dlls/kernel32/Makefile.in   |    2 +-
 dlls/kernel32/comm.c        |    8 ++++----
 dlls/kernel32/console.c     |   18 +++++++++---------
 dlls/kernel32/file.c        |    4 ++--
 dlls/kernel32/heap.c        |    4 ++--
 dlls/kernel32/kernel_main.c |    2 +-
 dlls/kernel32/lcformat.c    |   34 +++++++++++++++++-----------------
 dlls/kernel32/locale.c      |    2 +-
 dlls/kernel32/lzexpand.c    |    2 +-
 dlls/kernel32/path.c        |   10 +++++-----
 dlls/kernel32/process.c     |   30 +++++++++++++++---------------
 dlls/kernel32/profile.c     |    8 ++++----
 dlls/kernel32/resource.c    |   28 ++++++++++++++--------------
 dlls/kernel32/sync.c        |   10 +++++-----
 dlls/kernel32/tape.c        |   26 +++++++++++++-------------
 dlls/kernel32/thread.c      |    2 +-
 dlls/kernel32/toolhelp.c    |   12 ++++++------
 dlls/kernel32/version.c     |    2 +-
 dlls/kernel32/volume.c      |   10 +++++-----
 19 files changed, 107 insertions(+), 107 deletions(-)

diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in
index 1b876fd65b9..7e68a950b71 100644
--- a/dlls/kernel32/Makefile.in
+++ b/dlls/kernel32/Makefile.in
@@ -1,4 +1,4 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES -D_KERNEL32_ -D_NORMALIZE_
+EXTRADEFS = -D_KERNEL32_ -D_NORMALIZE_
 MODULE    = kernel32.dll
 IMPORTLIB = kernel32
 IMPORTS   = kernelbase ntdll winecrt0
diff --git a/dlls/kernel32/comm.c b/dlls/kernel32/comm.c
index e6d1c06b11e..f63be7270cf 100644
--- a/dlls/kernel32/comm.c
+++ b/dlls/kernel32/comm.c
@@ -622,7 +622,7 @@ BOOL WINAPI SetDefaultCommConfigW(LPCWSTR lpszDevice, LPCOMMCONFIG lpCommConfig,
     HMODULE hConfigModule;
     BOOL r = FALSE;

-    TRACE("(%s, %p, %u)\n", debugstr_w(lpszDevice), lpCommConfig, dwSize);
+    TRACE("(%s, %p, %lu)\n", debugstr_w(lpszDevice), lpCommConfig, dwSize);

hConfigModule = LoadLibraryW(lpszSerialUI);
     if(!hConfigModule)
@@ -652,7 +652,7 @@ BOOL WINAPI SetDefaultCommConfigA(LPCSTR lpszDevice, LPCOMMCONFIG lpCommConfig,
     LPWSTR lpDeviceW = NULL;
     DWORD len;

-    TRACE("(%s, %p, %u)\n", debugstr_a(lpszDevice), lpCommConfig, dwSize);
+    TRACE("(%s, %p, %lu)\n", debugstr_a(lpszDevice), lpCommConfig, dwSize);

if (lpszDevice)
     {
@@ -687,7 +687,7 @@ BOOL WINAPI GetDefaultCommConfigW(
     HMODULE hConfigModule;
     DWORD   res = ERROR_INVALID_PARAMETER;

-    TRACE("(%s, %p, %p)  *lpdwSize: %u\n", debugstr_w(lpszName), lpCC, lpdwSize, lpdwSize ? *lpdwSize : 0 );
+    TRACE("(%s, %p, %p)  *lpdwSize: %lu\n", debugstr_w(lpszName), lpCC, lpdwSize, lpdwSize ? *lpdwSize : 0 );
     hConfigModule = LoadLibraryW(lpszSerialUI);

if (hConfigModule) {
@@ -722,7 +722,7 @@ BOOL WINAPI GetDefaultCommConfigA(
    BOOL ret = FALSE;
    UNICODE_STRING lpszNameW;

-	TRACE("(%s, %p, %p)  *lpdwSize: %u\n", debugstr_a(lpszName), lpCC, lpdwSize, lpdwSize ? *lpdwSize : 0 );
+	TRACE("(%s, %p, %p)  *lpdwSize: %lu\n", debugstr_a(lpszName), lpCC, lpdwSize, lpdwSize ? *lpdwSize : 0 );
    if(lpszName) RtlCreateUnicodeStringFromAsciiz(&lpszNameW,lpszName);
    else lpszNameW.Buffer = NULL;

diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c
index 58bd18d2a5f..395d539a5dc 100644
--- a/dlls/kernel32/console.c
+++ b/dlls/kernel32/console.c
@@ -72,7 +72,7 @@ HANDLE WINAPI OpenConsoleW(LPCWSTR name, DWORD access, BOOL inherit, DWORD creat
 {
     SECURITY_ATTRIBUTES sa;

-    TRACE("(%s, 0x%08x, %d, %u)\n", debugstr_w(name), access, inherit, creation);
+    TRACE("(%s, 0x%08lx, %d, %lu)\n", debugstr_w(name), access, inherit, creation);

if (!name || (wcsicmp( L"CONIN$", name ) && wcsicmp( L"CONOUT$", name )) || creation != OPEN_EXISTING)
     {
@@ -221,7 +221,7 @@ BOOL WINAPI GetConsoleDisplayMode(LPDWORD lpModeFlags)
 BOOL WINAPI SetConsoleDisplayMode(HANDLE hConsoleOutput, DWORD dwFlags,
                                   COORD *lpNewScreenBufferDimensions)
 {
-    TRACE("(%p, %x, (%d, %d))\n", hConsoleOutput, dwFlags,
+    TRACE("(%p, %lx, (%d, %d))\n", hConsoleOutput, dwFlags,
           lpNewScreenBufferDimensions->X, lpNewScreenBufferDimensions->Y);
     if (dwFlags == 1)
     {
@@ -242,7 +242,7 @@ BOOL WINAPI SetConsoleDisplayMode(HANDLE hConsoleOutput, DWORD dwFlags,
 DWORD WINAPI GetConsoleAliasW(LPWSTR lpSource, LPWSTR lpTargetBuffer,
                               DWORD TargetBufferLength, LPWSTR lpExename)
 {
-    FIXME("(%s,%p,%d,%s): stub\n", debugstr_w(lpSource), lpTargetBuffer, TargetBufferLength, debugstr_w(lpExename));
+    FIXME("(%s,%p,%ld,%s): stub\n", debugstr_w(lpSource), lpTargetBuffer, TargetBufferLength, debugstr_w(lpExename));
     SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
     return 0;
 }
@@ -252,7 +252,7 @@ DWORD WINAPI GetConsoleAliasW(LPWSTR lpSource, LPWSTR lpTargetBuffer,
  */
 DWORD WINAPI GetConsoleProcessList(LPDWORD processlist, DWORD processcount)
 {
-    FIXME("(%p,%d): stub\n", processlist, processcount);
+    FIXME("(%p,%ld): stub\n", processlist, processcount);

if (!processlist || processcount < 1)
     {
@@ -266,7 +266,7 @@ DWORD WINAPI GetConsoleProcessList(LPDWORD processlist, DWORD processcount)
 /* Undocumented, called by native doskey.exe */
 DWORD WINAPI GetConsoleCommandHistoryA(DWORD unknown1, DWORD unknown2, DWORD unknown3)
 {
-    FIXME(": (0x%x, 0x%x, 0x%x) stub!\n", unknown1, unknown2, unknown3);
+    FIXME(": (0x%lx, 0x%lx, 0x%lx) stub!\n", unknown1, unknown2, unknown3);
     SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
     return 0;
 }
@@ -274,7 +274,7 @@ DWORD WINAPI GetConsoleCommandHistoryA(DWORD unknown1, DWORD unknown2, DWORD unk
 /* Undocumented, called by native doskey.exe */
 DWORD WINAPI GetConsoleCommandHistoryW(DWORD unknown1, DWORD unknown2, DWORD unknown3)
 {
-    FIXME(": (0x%x, 0x%x, 0x%x) stub!\n", unknown1, unknown2, unknown3);
+    FIXME(": (0x%lx, 0x%lx, 0x%lx) stub!\n", unknown1, unknown2, unknown3);
     SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
     return 0;
 }
@@ -364,14 +364,14 @@ DWORD WINAPI GetNumberOfConsoleFonts(void)

BOOL WINAPI SetConsoleFont(HANDLE hConsole, DWORD index)
 {
-    FIXME("(%p, %u): stub!\n", hConsole, index);
+    FIXME("(%p, %lu): stub!\n", hConsole, index);
     SetLastError(LOWORD(E_NOTIMPL) /* win10 1709+ */);
     return FALSE;
 }

BOOL WINAPI SetConsoleKeyShortcuts(BOOL set, BYTE keys, VOID *a, DWORD b)
 {
-    FIXME(": (%u %u %p %u) stub!\n", set, keys, a, b);
+    FIXME(": (%u %u %p %lu) stub!\n", set, keys, a, b);
     SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
     return FALSE;
 }
@@ -476,7 +476,7 @@ COORD WINAPI GetConsoleFontSize(HANDLE hConsole, DWORD index)

BOOL WINAPI GetConsoleFontInfo(HANDLE hConsole, BOOL maximize, DWORD numfonts, CONSOLE_FONT_INFO *info)
 {
-    FIXME("(%p %d %u %p): stub!\n", hConsole, maximize, numfonts, info);
+    FIXME("(%p %d %lu %p): stub!\n", hConsole, maximize, numfonts, info);
     SetLastError(LOWORD(E_NOTIMPL) /* win10 1709+ */);
     return FALSE;
 }
diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c
index 6592bede4a9..be355c9090d 100644
--- a/dlls/kernel32/file.c
+++ b/dlls/kernel32/file.c
@@ -169,7 +169,7 @@ LONG WINAPI _hwrite( HFILE handle, LPCSTR buffer, LONG count )
 {
     DWORD result;

-    TRACE("%d %p %d\n", handle, buffer, count );
+    TRACE("%d %p %ld\n", handle, buffer, count );

if (!count)
     {
@@ -392,7 +392,7 @@ BOOL WINAPI KERNEL32_DeviceIoControl( HANDLE handle, DWORD code, void *in_buff,
                                       void *out_buff, DWORD out_count, DWORD *returned,
                                       OVERLAPPED *overlapped )
 {
-    TRACE( "(%p,%#x,%p,%d,%p,%d,%p,%p)\n",
+    TRACE( "(%p,%#lx,%p,%ld,%p,%ld,%p,%p)\n",
            handle, code, in_buff, in_count, out_buff, out_count, returned, overlapped );

/* Check if this is a user defined control code for a VxD */
diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c
index 02f4587d43b..8e767d03211 100644
--- a/dlls/kernel32/heap.c
+++ b/dlls/kernel32/heap.c
@@ -605,8 +605,8 @@ VOID WINAPI GlobalMemoryStatus( LPMEMORYSTATUS lpBuffer )
     }
 #endif

-    TRACE("Length %u, MemoryLoad %u, TotalPhys %lx, AvailPhys %lx,"
-          " TotalPageFile %lx, AvailPageFile %lx, TotalVirtual %lx, AvailVirtual %lx\n",
+    TRACE("Length %lu, MemoryLoad %lu, TotalPhys %Ix, AvailPhys %Ix,"
+          " TotalPageFile %Ix, AvailPageFile %Ix, TotalVirtual %Ix, AvailVirtual %Ix\n",
           lpBuffer->dwLength, lpBuffer->dwMemoryLoad, lpBuffer->dwTotalPhys,
           lpBuffer->dwAvailPhys, lpBuffer->dwTotalPageFile, lpBuffer->dwAvailPageFile,
           lpBuffer->dwTotalVirtual, lpBuffer->dwAvailVirtual );
diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c
index 4467af739e0..352a873933f 100644
--- a/dlls/kernel32/kernel_main.c
+++ b/dlls/kernel32/kernel_main.c
@@ -62,7 +62,7 @@ static void set_entry_point( HMODULE module, const char *name, DWORD rva )
                 WORD ordinal = ordinals[pos];
                 DWORD oldprot;

-                TRACE( "setting %s at %p to %08x\n", name, &functions[ordinal], rva );
+                TRACE( "setting %s at %p to %08lx\n", name, &functions[ordinal], rva );
                 VirtualProtect( functions + ordinal, sizeof(*functions), PAGE_READWRITE, &oldprot );
                 functions[ordinal] = rva;
                 VirtualProtect( functions + ordinal, sizeof(*functions), oldprot, &oldprot );
diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c
index 22a9efb24c7..76837a62431 100644
--- a/dlls/kernel32/lcformat.c
+++ b/dlls/kernel32/lcformat.c
@@ -135,7 +135,7 @@ static WCHAR* NLS_GetLocaleString(LCID lcid, DWORD dwFlags)
 }

#define GET_LOCALE_NUMBER(num, type) num = NLS_GetLocaleNumber(lcid, type|dwFlags); \
-  TRACE( #type ": %d (%08x)\n", (DWORD)num, (DWORD)num)
+  TRACE( #type ": %ld (%08lx)\n", (DWORD)num, (DWORD)num)

#define GET_LOCALE_STRING(str, type) str = NLS_GetLocaleString(lcid, type|dwFlags); \
   TRACE( #type ": %s\n", debugstr_w(str))
@@ -185,7 +185,7 @@ static const NLS_FORMAT_NODE *NLS_GetFormats(LCID lcid, DWORD dwFlags)

dwFlags &= LOCALE_NOUSEROVERRIDE;

-  TRACE("(0x%04x,0x%08x)\n", lcid, dwFlags);
+  TRACE("(0x%04lx,0x%08lx)\n", lcid, dwFlags);

/* See if we have already cached the locales number format */
   while (node && (node->lcid != lcid || node->dwFlags != dwFlags) && node->next)
@@ -333,7 +333,7 @@ static BOOL NLS_IsUnicodeOnlyLcid(LCID lcid)
   case LANG_MARATHI:
   case LANG_PUNJABI:
   case LANG_SANSKRIT:
-    TRACE("lcid 0x%08x: langid 0x%04x is Unicode Only\n", lcid, PRIMARYLANGID(lcid));
+    TRACE("lcid 0x%08lx: langid 0x%04x is Unicode Only\n", lcid, PRIMARYLANGID(lcid));
     return TRUE;
   default:
     return FALSE;
@@ -747,7 +747,7 @@ static INT NLS_GetDateTimeFormatA(LCID lcid, DWORD dwFlags,
   WCHAR szFormat[128], szOut[128];
   INT iRet, cchOutW;

-  TRACE("(0x%04x,0x%08x,%p,%s,%p,%d)\n", lcid, dwFlags, lpTime,
+  TRACE("(0x%04lx,0x%08lx,%p,%s,%p,%d)\n", lcid, dwFlags, lpTime,
         debugstr_a(lpFormat), lpStr, cchOut);

if ((cchOut && !lpStr) || NLS_IsUnicodeOnlyLcid(lcid))
@@ -826,7 +826,7 @@ static INT NLS_GetDateTimeFormatA(LCID lcid, DWORD dwFlags,
 INT WINAPI GetDateFormatA( LCID lcid, DWORD dwFlags, const SYSTEMTIME* lpTime,
                            LPCSTR lpFormat, LPSTR lpDateStr, INT cchOut)
 {
-  TRACE("(0x%04x,0x%08x,%p,%s,%p,%d)\n",lcid, dwFlags, lpTime,
+  TRACE("(0x%04lx,0x%08lx,%p,%s,%p,%d)\n",lcid, dwFlags, lpTime,
         debugstr_a(lpFormat), lpDateStr, cchOut);

return NLS_GetDateTimeFormatA(lcid, dwFlags | DATE_DATEVARSONLY, lpTime,
@@ -858,7 +858,7 @@ INT WINAPI GetDateFormatEx(LPCWSTR localename, DWORD flags,
                            const SYSTEMTIME* date, LPCWSTR format,
                            LPWSTR outbuf, INT bufsize, LPCWSTR calendar)
 {
-  TRACE("(%s,0x%08x,%p,%s,%p,%d,%s)\n", debugstr_w(localename), flags,
+  TRACE("(%s,0x%08lx,%p,%s,%p,%d,%s)\n", debugstr_w(localename), flags,
         date, debugstr_w(format), outbuf, bufsize, debugstr_w(calendar));

/* Parameter is currently reserved and Windows errors if set */
@@ -881,7 +881,7 @@ INT WINAPI GetDateFormatEx(LPCWSTR localename, DWORD flags,
 INT WINAPI GetDateFormatW(LCID lcid, DWORD dwFlags, const SYSTEMTIME* lpTime,
                           LPCWSTR lpFormat, LPWSTR lpDateStr, INT cchOut)
 {
-  TRACE("(0x%04x,0x%08x,%p,%s,%p,%d)\n", lcid, dwFlags, lpTime,
+  TRACE("(0x%04lx,0x%08lx,%p,%s,%p,%d)\n", lcid, dwFlags, lpTime,
         debugstr_w(lpFormat), lpDateStr, cchOut);

return NLS_GetDateTimeFormatW(lcid, dwFlags|DATE_DATEVARSONLY, lpTime,
@@ -932,7 +932,7 @@ INT WINAPI GetDateFormatW(LCID lcid, DWORD dwFlags, const SYSTEMTIME* lpTime,
 INT WINAPI GetTimeFormatA(LCID lcid, DWORD dwFlags, const SYSTEMTIME* lpTime,
                           LPCSTR lpFormat, LPSTR lpTimeStr, INT cchOut)
 {
-  TRACE("(0x%04x,0x%08x,%p,%s,%p,%d)\n",lcid, dwFlags, lpTime,
+  TRACE("(0x%04lx,0x%08lx,%p,%s,%p,%d)\n",lcid, dwFlags, lpTime,
         debugstr_a(lpFormat), lpTimeStr, cchOut);

return NLS_GetDateTimeFormatA(lcid, dwFlags|TIME_TIMEVARSONLY, lpTime,
@@ -963,7 +963,7 @@ INT WINAPI GetTimeFormatEx(LPCWSTR localename, DWORD flags,
                            const SYSTEMTIME* time, LPCWSTR format,
                            LPWSTR outbuf, INT bufsize)
 {
-  TRACE("(%s,0x%08x,%p,%s,%p,%d)\n", debugstr_w(localename), flags, time,
+  TRACE("(%s,0x%08lx,%p,%s,%p,%d)\n", debugstr_w(localename), flags, time,
         debugstr_w(format), outbuf, bufsize);

return NLS_GetDateTimeFormatW(LocaleNameToLCID(localename, 0),
@@ -979,7 +979,7 @@ INT WINAPI GetTimeFormatEx(LPCWSTR localename, DWORD flags,
 INT WINAPI GetTimeFormatW(LCID lcid, DWORD dwFlags, const SYSTEMTIME* lpTime,
                           LPCWSTR lpFormat, LPWSTR lpTimeStr, INT cchOut)
 {
-  TRACE("(0x%04x,0x%08x,%p,%s,%p,%d)\n",lcid, dwFlags, lpTime,
+  TRACE("(0x%04lx,0x%08lx,%p,%s,%p,%d)\n",lcid, dwFlags, lpTime,
         debugstr_w(lpFormat), lpTimeStr, cchOut);

return NLS_GetDateTimeFormatW(lcid, dwFlags|TIME_TIMEVARSONLY, lpTime,
@@ -1023,7 +1023,7 @@ INT WINAPI GetNumberFormatA(LCID lcid, DWORD dwFlags,
   const NUMBERFMTW *pfmt = NULL;
   INT iRet;

-  TRACE("(0x%04x,0x%08x,%s,%p,%p,%d)\n", lcid, dwFlags, debugstr_a(lpszValue),
+  TRACE("(0x%04lx,0x%08lx,%s,%p,%p,%d)\n", lcid, dwFlags, debugstr_a(lpszValue),
         lpFormat, lpNumberStr, cchOut);

if (NLS_IsUnicodeOnlyLcid(lcid))
@@ -1105,7 +1105,7 @@ INT WINAPI GetNumberFormatW(LCID lcid, DWORD dwFlags,
   DWORD dwState = 0, dwDecimals = 0, dwGroupCount = 0, dwCurrentGroupCount = 0;
   INT iRet;

-  TRACE("(0x%04x,0x%08x,%s,%p,%p,%d)\n", lcid, dwFlags, debugstr_w(lpszValue),
+  TRACE("(0x%04lx,0x%08lx,%s,%p,%p,%d)\n", lcid, dwFlags, debugstr_w(lpszValue),
         lpFormat, lpNumberStr, cchOut);

if (!lpszValue || cchOut < 0 || (cchOut > 0 && !lpNumberStr) ||
@@ -1340,7 +1340,7 @@ INT WINAPI GetNumberFormatEx(LPCWSTR name, DWORD flags,
 {
   LCID lcid;

-  TRACE("(%s,0x%08x,%s,%p,%p,%d)\n", debugstr_w(name), flags,
+  TRACE("(%s,0x%08lx,%s,%p,%p,%d)\n", debugstr_w(name), flags,
         debugstr_w(value), format, number, numout);

lcid = LocaleNameToLCID(name, 0);
@@ -1387,7 +1387,7 @@ INT WINAPI GetCurrencyFormatA(LCID lcid, DWORD dwFlags,
   const CURRENCYFMTW *pfmt = NULL;
   INT iRet;

-  TRACE("(0x%04x,0x%08x,%s,%p,%p,%d)\n", lcid, dwFlags, debugstr_a(lpszValue),
+  TRACE("(0x%04lx,0x%08lx,%s,%p,%p,%d)\n", lcid, dwFlags, debugstr_a(lpszValue),
         lpFormat, lpCurrencyStr, cchOut);

if (NLS_IsUnicodeOnlyLcid(lcid))
@@ -1495,7 +1495,7 @@ INT WINAPI GetCurrencyFormatW(LCID lcid, DWORD dwFlags,
   DWORD dwState = 0, dwDecimals = 0, dwGroupCount = 0, dwCurrentGroupCount = 0, dwFmt;
   INT iRet;

-  TRACE("(0x%04x,0x%08x,%s,%p,%p,%d)\n", lcid, dwFlags, debugstr_w(lpszValue),
+  TRACE("(0x%04lx,0x%08lx,%s,%p,%p,%d)\n", lcid, dwFlags, debugstr_w(lpszValue),
         lpFormat, lpCurrencyStr, cchOut);

if (!lpszValue || cchOut < 0 || (cchOut > 0 && !lpCurrencyStr) ||
@@ -1749,7 +1749,7 @@ error:
 int WINAPI GetCurrencyFormatEx(LPCWSTR localename, DWORD flags, LPCWSTR value,
                                 const CURRENCYFMTW *format, LPWSTR str, int len)
 {
-    TRACE("(%s,0x%08x,%s,%p,%p,%d)\n", debugstr_w(localename), flags,
+    TRACE("(%s,0x%08lx,%s,%p,%p,%d)\n", debugstr_w(localename), flags,
             debugstr_w(value), format, str, len);

return GetCurrencyFormatW( LocaleNameToLCID(localename, 0), flags, value, format, str, len);
@@ -1785,6 +1785,6 @@ int WINAPI GetCalendarInfoA( LCID lcid, CALID id, CALTYPE type, LPSTR data, int
  */
 int WINAPI SetCalendarInfoA( LCID lcid, CALID id, CALTYPE type, LPCSTR data)
 {
-    FIXME("(%08x,%08x,%08x,%s): stub\n", lcid, id, type, debugstr_a(data));
+    FIXME("(%08lx,%08lx,%08lx,%s): stub\n", lcid, id, type, debugstr_a(data));
     return 0;
 }
diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c
index 402484f93c9..020ec3d843d 100644
--- a/dlls/kernel32/locale.c
+++ b/dlls/kernel32/locale.c
@@ -384,7 +384,7 @@ INT WINAPI GetGeoInfoA(GEOID geoid, GEOTYPE geotype, LPSTR data, int data_len, L
     WCHAR *buffW;
     INT len;

-    TRACE("%d %d %p %d %d\n", geoid, geotype, data, data_len, lang);
+    TRACE("%ld %ld %p %d %d\n", geoid, geotype, data, data_len, lang);

len = GetGeoInfoW(geoid, geotype, NULL, 0, lang);
     if (!len)
diff --git a/dlls/kernel32/lzexpand.c b/dlls/kernel32/lzexpand.c
index b021a6012b9..532c26cbedf 100644
--- a/dlls/kernel32/lzexpand.c
+++ b/dlls/kernel32/lzexpand.c
@@ -416,7 +416,7 @@ LONG WINAPI LZSeek( HFILE fd, LONG off, INT type )
    struct	lzstate	*lzs;
    LONG	newwanted;

-	TRACE("(%d,%d,%d)\n",fd,off,type);
+	TRACE("(%d,%ld,%d)\n",fd,off,type);
    /* not compressed? just use normal _llseek() */
         if (!(lzs = GET_LZ_STATE(fd))) return _llseek(fd,off,type);
    newwanted = lzs->realwanted;
diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c
index 957e9fca01d..2dd3eac3c26 100644
--- a/dlls/kernel32/path.c
+++ b/dlls/kernel32/path.c
@@ -143,7 +143,7 @@ BOOL WINAPI CopyFileExA(LPCSTR sourceFilename, LPCSTR destFilename,
  */
 BOOL WINAPI MoveFileTransactedA(const char *source, const char *dest, LPPROGRESS_ROUTINE progress, void *data, DWORD flags, HANDLE handle)
 {
-    FIXME("(%s, %s, %p, %p, %d, %p)\n", debugstr_a(source), debugstr_a(dest), progress, data, flags, handle);
+    FIXME("(%s, %s, %p, %p, %ld, %p)\n", debugstr_a(source), debugstr_a(dest), progress, data, flags, handle);
     SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
     return FALSE;
 }
@@ -153,7 +153,7 @@ BOOL WINAPI MoveFileTransactedA(const char *source, const char *dest, LPPROGRESS
  */
 BOOL WINAPI MoveFileTransactedW(const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUTINE progress, void *data, DWORD flags, HANDLE handle)
 {
-    FIXME("(%s, %s, %p, %p, %d, %p)\n", debugstr_w(source), debugstr_w(dest), progress, data, flags, handle);
+    FIXME("(%s, %s, %p, %p, %ld, %p)\n", debugstr_w(source), debugstr_w(dest), progress, data, flags, handle);
     SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
     return FALSE;
 }
@@ -352,7 +352,7 @@ WCHAR * CDECL wine_get_dos_file_name( LPCSTR str )
  */
 BOOLEAN WINAPI CreateSymbolicLinkA(LPCSTR link, LPCSTR target, DWORD flags)
 {
-    FIXME("(%s %s %d): stub\n", debugstr_a(link), debugstr_a(target), flags);
+    FIXME("(%s %s %ld): stub\n", debugstr_a(link), debugstr_a(target), flags);
     return TRUE;
 }

@@ -384,7 +384,7 @@ BOOL WINAPI CheckNameLegalDOS8Dot3A(const char *name, char *oemname, DWORD oemna
 {
     WCHAR *nameW;

-    TRACE("(%s %p %u %p %p)\n", name, oemname,
+    TRACE("(%s %p %lu %p %p)\n", name, oemname,
             oemname_len, contains_spaces, is_legal);

if (!name || !is_legal)
@@ -405,7 +405,7 @@ BOOL WINAPI CheckNameLegalDOS8Dot3W(const WCHAR *name, char *oemname, DWORD oemn
     UNICODE_STRING nameW;
     BOOLEAN contains_spaces;

-    TRACE("(%s %p %u %p %p)\n", wine_dbgstr_w(name), oemname,
+    TRACE("(%s %p %lu %p %p)\n", wine_dbgstr_w(name), oemname,
           oemname_len, contains_spaces_ret, is_legal);

if (!name || !is_legal)
diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
index 01f45210ae1..4630043645c 100644
--- a/dlls/kernel32/process.c
+++ b/dlls/kernel32/process.c
@@ -104,7 +104,7 @@ UINT WINAPI DECLSPEC_HOTPATCH WinExec( LPCSTR lpCmdLine, UINT nCmdShow )
     {
         /* Give 30 seconds to the app to come up */
         if (wait_input_idle( info.hProcess, 30000 ) == WAIT_FAILED)
-            WARN("WaitForInputIdle failed: Error %d\n", GetLastError() );
+            WARN("WaitForInputIdle failed: Error %ld\n", GetLastError() );
         ret = 33;
         /* Close off the handles */
         CloseHandle( info.hThread );
@@ -162,7 +162,7 @@ DWORD WINAPI LoadModule( LPCSTR name, LPVOID paramBlock )
     {
         /* Give 30 seconds to the app to come up */
         if (wait_input_idle( info.hProcess, 30000 ) == WAIT_FAILED)
-            WARN("WaitForInputIdle failed: Error %d\n", GetLastError() );
+            WARN("WaitForInputIdle failed: Error %ld\n", GetLastError() );
         ret = 33;
         /* Close off the handles */
         CloseHandle( info.hThread );
@@ -170,7 +170,7 @@ DWORD WINAPI LoadModule( LPCSTR name, LPVOID paramBlock )
     }
     else if ((ret = GetLastError()) >= 32)
     {
-        FIXME("Strange error set by CreateProcess: %u\n", ret );
+        FIXME("Strange error set by CreateProcess: %lu\n", ret );
         ret = 11;
     }

@@ -281,7 +281,7 @@ HANDLE WINAPI ConvertToGlobalHandle(HANDLE hSrc)
  */
 BOOL WINAPI SetHandleContext(HANDLE hnd,DWORD context)
 {
-    FIXME("(%p,%d), stub. In case this got called by WSOCK32/WS2_32: "
+    FIXME("(%p,%ld), stub. In case this got called by WSOCK32/WS2_32: "
           "the external WINSOCK DLLs won't work with WINE, don't use them.\n",hnd,context);
     SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
     return FALSE;
@@ -420,7 +420,7 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateActCtxA( const ACTCTXA *actctx )
     HANDLE ret = INVALID_HANDLE_VALUE;
     LPWSTR src = NULL, assdir = NULL, resname = NULL, appname = NULL;

-    TRACE("%p %08x\n", actctx, actctx ? actctx->dwFlags : 0);
+    TRACE("%p %08lx\n", actctx, actctx ? actctx->dwFlags : 0);

if (!actctx || actctx->cbSize != sizeof(*actctx))
     {
@@ -494,7 +494,7 @@ BOOL WINAPI FindActCtxSectionStringA( DWORD flags, const GUID *guid, ULONG id, c
     DWORD len;
     BOOL ret;

-    TRACE("%08x %s %u %s %p\n", flags, debugstr_guid(guid), id, debugstr_a(search), info);
+    TRACE("%08lx %s %lu %s %p\n", flags, debugstr_guid(guid), id, debugstr_a(search), info);

if (!search || !info)
     {
@@ -533,7 +533,7 @@ BOOL WINAPI CmdBatNotification( BOOL bBatchRunning )
  */
 HRESULT WINAPI RegisterApplicationRestart(PCWSTR pwzCommandLine, DWORD dwFlags)
 {
-    FIXME("(%s,%d)\n", debugstr_w(pwzCommandLine), dwFlags);
+    FIXME("(%s,%ld)\n", debugstr_w(pwzCommandLine), dwFlags);

return S_OK;
 }
@@ -564,7 +564,7 @@ BOOL WINAPI SetProcessDEPPolicy( DWORD flags )
 {
     ULONG dep_flags = 0;

-    TRACE("%#x\n", flags);
+    TRACE("%#lx\n", flags);

if (flags & PROCESS_DEP_ENABLE)
         dep_flags |= MEM_EXECUTE_OPTION_DISABLE | MEM_EXECUTE_OPTION_PERMANENT;
@@ -599,7 +599,7 @@ HRESULT WINAPI ApplicationRecoveryInProgress(PBOOL canceled)
  */
 HRESULT WINAPI RegisterApplicationRecoveryCallback(APPLICATION_RECOVERY_CALLBACK callback, PVOID param, DWORD pingint, DWORD flags)
 {
-    FIXME("%p, %p, %d, %d: stub, faking success\n", callback, param, pingint, flags);
+    FIXME("%p, %p, %ld, %ld: stub, faking success\n", callback, param, pingint, flags);
     return S_OK;
 }

@@ -715,7 +715,7 @@ WORD WINAPI GetMaximumProcessorGroupCount(void)
  */
 DWORD WINAPI GetFirmwareEnvironmentVariableA(LPCSTR name, LPCSTR guid, PVOID buffer, DWORD size)
 {
-    FIXME("stub: %s %s %p %u\n", debugstr_a(name), debugstr_a(guid), buffer, size);
+    FIXME("stub: %s %s %p %lu\n", debugstr_a(name), debugstr_a(guid), buffer, size);
     SetLastError(ERROR_INVALID_FUNCTION);
     return 0;
 }
@@ -725,7 +725,7 @@ DWORD WINAPI GetFirmwareEnvironmentVariableA(LPCSTR name, LPCSTR guid, PVOID buf
  */
 DWORD WINAPI GetFirmwareEnvironmentVariableW(LPCWSTR name, LPCWSTR guid, PVOID buffer, DWORD size)
 {
-    FIXME("stub: %s %s %p %u\n", debugstr_w(name), debugstr_w(guid), buffer, size);
+    FIXME("stub: %s %s %p %lu\n", debugstr_w(name), debugstr_w(guid), buffer, size);
     SetLastError(ERROR_INVALID_FUNCTION);
     return 0;
 }
@@ -735,7 +735,7 @@ DWORD WINAPI GetFirmwareEnvironmentVariableW(LPCWSTR name, LPCWSTR guid, PVOID b
  */
 BOOL WINAPI SetFirmwareEnvironmentVariableW(const WCHAR *name, const WCHAR *guid, void *buffer, DWORD size)
 {
-    FIXME("stub: %s %s %p %u\n", debugstr_w(name), debugstr_w(guid), buffer, size);
+    FIXME("stub: %s %s %p %lu\n", debugstr_w(name), debugstr_w(guid), buffer, size);
     SetLastError(ERROR_INVALID_FUNCTION);
     return FALSE;
 }
@@ -887,7 +887,7 @@ BOOL WINAPI DeleteUmsThreadContext(PUMS_CONTEXT ctx)
  */
 BOOL WINAPI DequeueUmsCompletionListItems(void *list, DWORD timeout, PUMS_CONTEXT *ctx)
 {
-    FIXME( "%p,%08x,%p: stub\n", list, timeout, ctx );
+    FIXME( "%p,%08lx,%p: stub\n", list, timeout, ctx );
     SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
     return FALSE;
 }
@@ -948,7 +948,7 @@ BOOL WINAPI GetUmsCompletionListEvent(PUMS_COMPLETION_LIST list, HANDLE *event)
 BOOL WINAPI QueryUmsThreadInformation(PUMS_CONTEXT ctx, UMS_THREAD_INFO_CLASS class,
                                        void *buf, ULONG length, ULONG *ret_length)
 {
-    FIXME( "%p,%08x,%p,%08x,%p: stub\n", ctx, class, buf, length, ret_length );
+    FIXME( "%p,%08x,%p,%08lx,%p: stub\n", ctx, class, buf, length, ret_length );
     SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
     return FALSE;
 }
@@ -959,7 +959,7 @@ BOOL WINAPI QueryUmsThreadInformation(PUMS_CONTEXT ctx, UMS_THREAD_INFO_CLASS cl
 BOOL WINAPI SetUmsThreadInformation(PUMS_CONTEXT ctx, UMS_THREAD_INFO_CLASS class,
                                      void *buf, ULONG length)
 {
-    FIXME( "%p,%08x,%p,%08x: stub\n", ctx, class, buf, length );
+    FIXME( "%p,%08x,%p,%08lx: stub\n", ctx, class, buf, length );
     SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
     return FALSE;
 }
diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c
index 92c163700ac..e70874fa36f 100644
--- a/dlls/kernel32/profile.c
+++ b/dlls/kernel32/profile.c
@@ -322,7 +322,7 @@ static PROFILESECTION *PROFILE_Load(HANDLE hFile, ENCODING * pEncoding)
     if (!ReadFile(hFile, buffer_base, dwFileSize, &dwFileSize, NULL))
     {
         HeapFree(GetProcessHeap(), 0, buffer_base);
-        WARN("Error %d reading file\n", GetLastError());
+        WARN("Error %ld reading file\n", GetLastError());
         return NULL;
     }
     len = dwFileSize;
@@ -641,7 +641,7 @@ static BOOL PROFILE_FlushFile(void)

if (hFile == INVALID_HANDLE_VALUE)
     {
-        WARN("could not save profile file %s (error was %d)\n", debugstr_w(CurProfile->filename), GetLastError());
+        WARN("could not save profile file %s (error was %ld)\n", debugstr_w(CurProfile->filename), GetLastError());
         return FALSE;
     }

@@ -747,7 +747,7 @@ static BOOL PROFILE_Open( LPCWSTR filename, BOOL write_access )

if ((hFile == INVALID_HANDLE_VALUE) && (GetLastError() != ERROR_FILE_NOT_FOUND))
     {
-        WARN("Error %d opening file %s\n", GetLastError(), debugstr_w(buffer));
+        WARN("Error %ld opening file %s\n", GetLastError(), debugstr_w(buffer));
         return FALSE;
     }

@@ -1563,7 +1563,7 @@ INT WINAPI GetPrivateProfileSectionW( LPCWSTR section, LPWSTR buffer,
         return 0;
     }

-    TRACE("(%s, %p, %d, %s)\n", debugstr_w(section), buffer, len, debugstr_w(filename));
+    TRACE("(%s, %p, %ld, %s)\n", debugstr_w(section), buffer, len, debugstr_w(filename));

return get_section( filename, section, buffer, len, TRUE );
 }
diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c
index 18384e7f59f..ab30a88bfb4 100644
--- a/dlls/kernel32/resource.c
+++ b/dlls/kernel32/resource.c
@@ -464,7 +464,7 @@ static BOOL check_pe_exe( HANDLE file, QUEUEDUPDATES *updates )
     if (nt->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC)
         dd = &nt64->OptionalHeader.DataDirectory[0];

-    TRACE("resources: %08x %08x\n",
+    TRACE("resources: %08lx %08lx\n",
           dd[IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress,
           dd[IMAGE_DIRECTORY_ENTRY_RESOURCE].Size);

@@ -639,7 +639,7 @@ static BOOL read_mapped_resources( QUEUEDUPDATES *updates, void *base, DWORD map
         (sec[i].PointerToRawData + sec[i].SizeOfRawData) > mapping_size)
         return TRUE;

-    TRACE("found .rsrc at %08x, size %08x\n", sec[i].PointerToRawData, sec[i].SizeOfRawData);
+    TRACE("found .rsrc at %08lx, size %08lx\n", sec[i].PointerToRawData, sec[i].SizeOfRawData);

if (!sec[i].PointerToRawData || sec[i].SizeOfRawData < sizeof(IMAGE_RESOURCE_DIRECTORY))
         return TRUE;
@@ -726,7 +726,7 @@ static BOOL resize_mapping( struct mapping_info *mi, DWORD new_size )
     SetFilePointer( mi->file, new_size, NULL, FILE_BEGIN );
     if (!SetEndOfFile( mi->file ))
     {
-        ERR("failed to set file size to %08x\n", new_size );
+        ERR("failed to set file size to %08lx\n", new_size );
         return FALSE;
     }

@@ -784,7 +784,7 @@ static void get_resource_sizes( QUEUEDUPDATES *updates, struct resource_size_inf

si->total_size = si->data_ofs + data_size;

-    TRACE("names %08x langs %08x data entries %08x strings %08x data %08x total %08x\n",
+    TRACE("names %08lx langs %08lx data entries %08lx strings %08lx data %08lx total %08lx\n",
           si->names_ofs, si->langs_ofs, si->data_entry_ofs,
           si->strings_ofs, si->data_ofs, si->total_size);
 }
@@ -806,7 +806,7 @@ static BOOL write_resources( QUEUEDUPDATES *updates, LPBYTE base, struct resourc
     struct resource_data *data;
     IMAGE_RESOURCE_DIRECTORY *root;

-    TRACE("%p %p %p %08x\n", updates, base, si, rva );
+    TRACE("%p %p %p %08lx\n", updates, base, si, rva );

memset( base, 0, si->total_size );

@@ -974,7 +974,7 @@ static DWORD get_init_data_size( void *base, DWORD mapping_size )
         if (s[i].Characteristics & IMAGE_SCN_CNT_INITIALIZED_DATA)
             sz += s[i].SizeOfRawData;

-    TRACE("size = %08x\n", sz);
+    TRACE("size = %08lx\n", sz);

return sz;
 }
@@ -1040,13 +1040,13 @@ static BOOL write_raw_resources( QUEUEDUPDATES *updates )

if ((LONG)PeSectionAlignment <= 0)
     {
-        ERR("invalid section alignment %08x\n", PeSectionAlignment);
+        ERR("invalid section alignment %08lx\n", PeSectionAlignment);
         goto done;
     }

if ((LONG)PeFileAlignment <= 0)
     {
-        ERR("invalid file alignment %08x\n", PeFileAlignment);
+        ERR("invalid file alignment %08lx\n", PeFileAlignment);
         goto done;
     }

@@ -1074,7 +1074,7 @@ static BOOL write_raw_resources( QUEUEDUPDATES *updates )
         sec->SizeOfRawData = 0;
     }

-    TRACE("before .rsrc at %08x, size %08x\n", sec->PointerToRawData, sec->SizeOfRawData);
+    TRACE("before .rsrc at %08lx, size %08lx\n", sec->PointerToRawData, sec->SizeOfRawData);

get_resource_sizes( updates, &res_size );

@@ -1082,7 +1082,7 @@ static BOOL write_raw_resources( QUEUEDUPDATES *updates )
     section_size = res_size.total_size;
     section_size += (-section_size) % PeFileAlignment;

-    TRACE("requires %08x (%08x) bytes\n", res_size.total_size, section_size );
+    TRACE("requires %08lx (%08lx) bytes\n", res_size.total_size, section_size );

/* check if the file size needs to be changed */
     if (section_size != sec->SizeOfRawData)
@@ -1100,7 +1100,7 @@ static BOOL write_raw_resources( QUEUEDUPDATES *updates )
         /* postpone file truncation if there are some data to be moved down from file end */
         BOOL resize_after = mapping_size < old_size && !rsrc_is_last;

-        TRACE("file size %08x -> %08x\n", old_size, mapping_size);
+        TRACE("file size %08lx -> %08lx\n", old_size, mapping_size);

if (!resize_after)
         {
@@ -1184,13 +1184,13 @@ static BOOL write_raw_resources( QUEUEDUPDATES *updates )

res_base = (LPBYTE) write_map->base + sec->PointerToRawData;

-    TRACE("base = %p offset = %08x\n", write_map->base, sec->PointerToRawData);
+    TRACE("base = %p offset = %08lx\n", write_map->base, sec->PointerToRawData);

ret = write_resources( updates, res_base, &res_size, sec->VirtualAddress );

res_write_padding( res_base + res_size.total_size, section_size - res_size.total_size );

-    TRACE("after  .rsrc at %08x, size %08x\n", sec->PointerToRawData, sec->SizeOfRawData);
+    TRACE("after  .rsrc at %08lx, size %08lx\n", sec->PointerToRawData, sec->SizeOfRawData);

done:
     destroy_mapping( read_map );
@@ -1309,7 +1309,7 @@ BOOL WINAPI UpdateResourceW( HANDLE hUpdate, LPCWSTR lpType, LPCWSTR lpName,
     UNICODE_STRING nameW, typeW;
     BOOL ret = FALSE;

-    TRACE("%p %s %s %08x %p %d\n", hUpdate,
+    TRACE("%p %s %s %08x %p %ld\n", hUpdate,
           debugstr_w(lpType), debugstr_w(lpName), wLanguage, lpData, cbData);

nameW.Buffer = typeW.Buffer = NULL;
diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c
index 331cd80772a..219800a46e5 100644
--- a/dlls/kernel32/sync.c
+++ b/dlls/kernel32/sync.c
@@ -566,7 +566,7 @@ BOOL WINAPI GetNamedPipeHandleStateA(
     WCHAR *username = NULL;
     BOOL ret;

-    WARN("%p %p %p %p %p %p %d: semi-stub\n", hNamedPipe, lpState, lpCurInstances,
+    WARN("%p %p %p %p %p %p %ld: semi-stub\n", hNamedPipe, lpState, lpCurInstances,
          lpMaxCollectionCount, lpCollectDataTimeout, lpUsername, nUsernameMaxSize);

if (lpUsername && nUsernameMaxSize &&
@@ -593,7 +593,7 @@ BOOL WINAPI CallNamedPipeA(
     LPWSTR str = NULL;
     BOOL ret;

-    TRACE("%s %p %d %p %d %p %d\n",
+    TRACE("%s %p %ld %p %ld %p %ld\n",
            debugstr_a(lpNamedPipeName), lpInput, dwInputSize,
            lpOutput, dwOutputSize, lpBytesRead, nTimeout);

@@ -623,7 +623,7 @@ HANDLE WINAPI CreateMailslotA( LPCSTR lpName, DWORD nMaxMessageSize,
     HANDLE handle;
     LPWSTR name = NULL;

-    TRACE("%s %d %d %p\n", debugstr_a(lpName),
+    TRACE("%s %ld %ld %p\n", debugstr_a(lpName),
           nMaxMessageSize, lReadTimeout, sa);

if( lpName )
@@ -665,7 +665,7 @@ HANDLE WINAPI CreateMailslotW( LPCWSTR lpName, DWORD nMaxMessageSize,
     LARGE_INTEGER timeout;
     IO_STATUS_BLOCK iosb;

-    TRACE("%s %d %d %p\n", debugstr_w(lpName),
+    TRACE("%s %ld %ld %p\n", debugstr_w(lpName),
           nMaxMessageSize, lReadTimeout, sa);

if (!RtlDosPathNameToNtPathName_U( lpName, &nameW, NULL, NULL ))
@@ -767,7 +767,7 @@ BOOL WINAPI SetMailslotInfo( HANDLE hMailslot, DWORD dwReadTimeout)
     FILE_MAILSLOT_SET_INFORMATION info;
     IO_STATUS_BLOCK iosb;

-    TRACE("%p %d\n", hMailslot, dwReadTimeout);
+    TRACE("%p %ld\n", hMailslot, dwReadTimeout);

if (dwReadTimeout != MAILSLOT_WAIT_FOREVER)
         info.ReadTimeout.QuadPart = (ULONGLONG)dwReadTimeout * -10000;
diff --git a/dlls/kernel32/tape.c b/dlls/kernel32/tape.c
index 5ad8ed3fbb2..4d15a11126a 100644
--- a/dlls/kernel32/tape.c
+++ b/dlls/kernel32/tape.c
@@ -51,7 +51,7 @@ static DWORD set_error_from_status( NTSTATUS status )
 BOOL WINAPI BackupRead( HANDLE file, LPBYTE buffer, DWORD to_read,
     LPDWORD read, BOOL abort, BOOL security, LPVOID *context )
 {
-    FIXME( "(%p, %p, %d, %p, %d, %d, %p)\n", file, buffer,
+    FIXME( "(%p, %p, %ld, %p, %d, %d, %p)\n", file, buffer,
            to_read, read, abort, security, context );
     SetLastError( ERROR_NOT_SUPPORTED );
     return FALSE;
@@ -66,7 +66,7 @@ BOOL WINAPI BackupRead( HANDLE file, LPBYTE buffer, DWORD to_read,
 BOOL WINAPI BackupSeek( HANDLE file, DWORD seek_low, DWORD seek_high,
     LPDWORD seeked_low, LPDWORD seeked_high, LPVOID *context )
 {
-    FIXME( "(%p, %d, %d, %p, %p, %p)\n", file, seek_low,
+    FIXME( "(%p, %ld, %ld, %p, %p, %p)\n", file, seek_low,
            seek_high, seeked_low, seeked_high, context );
     SetLastError( ERROR_NOT_SUPPORTED );
     return FALSE;
@@ -81,7 +81,7 @@ BOOL WINAPI BackupSeek( HANDLE file, DWORD seek_low, DWORD seek_high,
 BOOL WINAPI BackupWrite( HANDLE file, LPBYTE buffer, DWORD to_write,
     LPDWORD written, BOOL abort, BOOL security, LPVOID *context )
 {
-    FIXME( "(%p, %p, %d, %p, %d, %d, %p)\n", file, buffer,
+    FIXME( "(%p, %p, %ld, %p, %d, %d, %p)\n", file, buffer,
            to_write, written, abort, security, context );
     SetLastError( ERROR_NOT_SUPPORTED );
     return FALSE;
@@ -100,7 +100,7 @@ DWORD WINAPI CreateTapePartition( HANDLE device, DWORD method,
     TAPE_CREATE_PARTITION part;
     IO_STATUS_BLOCK io;

-    TRACE( "(%p, %d, %d, %d)\n", device, method, count, size );
+    TRACE( "(%p, %ld, %ld, %ld)\n", device, method, count, size );

part.Method = method;
     part.Count = count;
@@ -124,7 +124,7 @@ DWORD WINAPI EraseTape( HANDLE device, DWORD type, BOOL immediate )
     TAPE_ERASE erase;
     IO_STATUS_BLOCK io;

-    TRACE( "(%p, %d, %d)\n", device, type, immediate );
+    TRACE( "(%p, %ld, %d)\n", device, type, immediate );

erase.Type = type;
     erase.Immediate = immediate;
@@ -147,7 +147,7 @@ DWORD WINAPI GetTapeParameters( HANDLE device, DWORD operation,
     NTSTATUS status = STATUS_INVALID_PARAMETER;
     IO_STATUS_BLOCK io;

-    TRACE( "(%p, %d, %p, %p)\n", device, operation, size, info );
+    TRACE( "(%p, %ld, %p, %p)\n", device, operation, size, info );

switch (operation)
     {
@@ -160,7 +160,7 @@ DWORD WINAPI GetTapeParameters( HANDLE device, DWORD operation,
             IOCTL_TAPE_GET_MEDIA_PARAMS, NULL, 0, info, *size ); 
         break;
     default:
-        ERR( "Unhandled operation: 0x%08x\n", operation );
+        ERR( "Unhandled operation: 0x%08lx\n", operation );
     }

return set_error_from_status( status );
@@ -179,7 +179,7 @@ DWORD WINAPI GetTapePosition( HANDLE device, DWORD type, LPDWORD partition,
     TAPE_GET_POSITION in, out;
     IO_STATUS_BLOCK io;

-    TRACE( "(%p, %d, %p, %p, %p)\n", device, type, partition, offset_low,
+    TRACE( "(%p, %ld, %p, %p, %p)\n", device, type, partition, offset_low,
            offset_high );

memset( &in, 0, sizeof(TAPE_GET_POSITION) );
@@ -230,7 +230,7 @@ DWORD WINAPI PrepareTape( HANDLE device, DWORD operation, BOOL immediate )
     TAPE_PREPARE prep;
     IO_STATUS_BLOCK io;

-    TRACE( "(%p, %d, %d)\n", device, operation, immediate );
+    TRACE( "(%p, %ld, %d)\n", device, operation, immediate );

prep.Operation = operation;
     prep.Immediate = immediate;
@@ -252,7 +252,7 @@ DWORD WINAPI SetTapeParameters( HANDLE device, DWORD operation, LPVOID info )
     NTSTATUS status = STATUS_INVALID_PARAMETER;
     IO_STATUS_BLOCK io;

-    TRACE( "(%p, %d, %p)\n", device, operation, info );
+    TRACE( "(%p, %ld, %p)\n", device, operation, info );

switch (operation)
     {
@@ -267,7 +267,7 @@ DWORD WINAPI SetTapeParameters( HANDLE device, DWORD operation, LPVOID info )
             NULL, 0 );
         break;
     default:
-        ERR( "Unhandled operation: 0x%08x\n", operation );
+        ERR( "Unhandled operation: 0x%08lx\n", operation );
     }

return set_error_from_status( status );
@@ -286,7 +286,7 @@ DWORD WINAPI SetTapePosition( HANDLE device, DWORD method, DWORD partition,
     TAPE_SET_POSITION pos;
     IO_STATUS_BLOCK io;

-    TRACE( "(%p, %d, %d, %d, %d, %d)\n", device, method, partition,
+    TRACE( "(%p, %ld, %ld, %ld, %ld, %d)\n", device, method, partition,
            offset_low, offset_high, immediate );

pos.Method = method;
@@ -314,7 +314,7 @@ DWORD WINAPI WriteTapemark( HANDLE device, DWORD type, DWORD count,
     TAPE_WRITE_MARKS marks;
     IO_STATUS_BLOCK io;

-    TRACE( "(%p, %d, %d, %d)\n", device, type, count, immediate );
+    TRACE( "(%p, %ld, %ld, %d)\n", device, type, count, immediate );

marks.Type = type;
     marks.Count = count;
diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c
index 050bd416553..a090c54aa28 100644
--- a/dlls/kernel32/thread.c
+++ b/dlls/kernel32/thread.c
@@ -106,7 +106,7 @@ BOOL WINAPI Wow64GetThreadContext( HANDLE handle, WOW64_CONTEXT *context)
  */
 BOOL WINAPI Wow64GetThreadSelectorEntry( HANDLE thread, DWORD selector, WOW64_LDT_ENTRY *selector_entry)
 {
-    FIXME("(%p %u %p): stub\n", thread, selector, selector_entry);
+    FIXME("(%p %lu %p): stub\n", thread, selector, selector_entry);
     return set_ntstatus( STATUS_NOT_IMPLEMENTED );
 }

diff --git a/dlls/kernel32/toolhelp.c b/dlls/kernel32/toolhelp.c
index d1eefbbe5da..5e1ec84d100 100644
--- a/dlls/kernel32/toolhelp.c
+++ b/dlls/kernel32/toolhelp.c
@@ -290,10 +290,10 @@ HANDLE WINAPI CreateToolhelp32Snapshot( DWORD flags, DWORD process )
     ULONG               num_pcs, num_thd, num_mod;
     HANDLE              hSnapShot = 0;

-    TRACE("%x,%x\n", flags, process );
+    TRACE("%lx,%lx\n", flags, process );
     if (!(flags & (TH32CS_SNAPPROCESS|TH32CS_SNAPTHREAD|TH32CS_SNAPMODULE)))
     {
-        FIXME("flags %x not implemented\n", flags );
+        FIXME("flags %lx not implemented\n", flags );
         SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
         return INVALID_HANDLE_VALUE;
     }
@@ -349,7 +349,7 @@ static BOOL next_thread( HANDLE hSnapShot, LPTHREADENTRY32 lpte, BOOL first )
     if (lpte->dwSize < sizeof(THREADENTRY32))
     {
         SetLastError( ERROR_INSUFFICIENT_BUFFER );
-        WARN("Result buffer too small (%d)\n", lpte->dwSize);
+        WARN("Result buffer too small (%ld)\n", lpte->dwSize);
         return FALSE;
     }
     if ((snap = MapViewOfFile( hSnapShot, FILE_MAP_ALL_ACCESS, 0, 0, 0 )))
@@ -404,7 +404,7 @@ static BOOL process_next( HANDLE hSnapShot, LPPROCESSENTRY32W lppe,
     if (lppe->dwSize < sz)
     {
         SetLastError( ERROR_INSUFFICIENT_BUFFER );
-        WARN("Result buffer too small (%d)\n", lppe->dwSize);
+        WARN("Result buffer too small (%ld)\n", lppe->dwSize);
         return FALSE;
     }
     if ((snap = MapViewOfFile( hSnapShot, FILE_MAP_ALL_ACCESS, 0, 0, 0 )))
@@ -494,7 +494,7 @@ static BOOL module_nextW( HANDLE hSnapShot, LPMODULEENTRY32W lpme, BOOL first )
     if (lpme->dwSize < sizeof (MODULEENTRY32W))
     {
         SetLastError( ERROR_INSUFFICIENT_BUFFER );
-        WARN("Result buffer too small (was: %d)\n", lpme->dwSize);
+        WARN("Result buffer too small (was: %ld)\n", lpme->dwSize);
         return FALSE;
     }
     if ((snap = MapViewOfFile( hSnapShot, FILE_MAP_ALL_ACCESS, 0, 0, 0 )))
@@ -546,7 +546,7 @@ static BOOL module_nextA( HANDLE handle, LPMODULEENTRY32 lpme, BOOL first )
     if (lpme->dwSize < sizeof(MODULEENTRY32))
     {
         SetLastError( ERROR_INSUFFICIENT_BUFFER );
-        WARN("Result buffer too small (was: %d)\n", lpme->dwSize);
+        WARN("Result buffer too small (was: %ld)\n", lpme->dwSize);
         return FALSE;
     }

diff --git a/dlls/kernel32/version.c b/dlls/kernel32/version.c
index 67ef31976e6..f64a393e4a3 100644
--- a/dlls/kernel32/version.c
+++ b/dlls/kernel32/version.c
@@ -124,7 +124,7 @@ BOOL WINAPI VerifyVersionInfoW( LPOSVERSIONINFOEXW info, DWORD dwTypeMask,
 {
     OSVERSIONINFOEXW ver;

-    TRACE("(%p 0x%x 0x%s)\n", info, dwTypeMask, wine_dbgstr_longlong(dwlConditionMask));
+    TRACE("(%p 0x%lx 0x%s)\n", info, dwTypeMask, wine_dbgstr_longlong(dwlConditionMask));

ver.dwOSVersionInfoSize = sizeof(ver);
     if (!GetVersionExW((OSVERSIONINFOW*)&ver)) return FALSE;
diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c
index 93f50c080ba..54fc65343ad 100644
--- a/dlls/kernel32/volume.c
+++ b/dlls/kernel32/volume.c
@@ -251,7 +251,7 @@ BOOL WINAPI SetVolumeLabelW( LPCWSTR root, LPCWSTR label )
     }
     else
     {
-        TRACE( "cannot open device %s: err %d\n", debugstr_w(device), GetLastError() );
+        TRACE( "cannot open device %s: err %ld\n", debugstr_w(device), GetLastError() );
         if (GetLastError() == ERROR_ACCESS_DENIED) return FALSE;
     }

@@ -323,7 +323,7 @@ BOOL WINAPI GetVolumeNameForVolumeMountPointA( LPCSTR path, LPSTR volume, DWORD
     WCHAR volumeW[50], *pathW = NULL;
     DWORD len = min(ARRAY_SIZE(volumeW), size );

-    TRACE("(%s, %p, %x)\n", debugstr_a(path), volume, size);
+    TRACE("(%s, %p, %lx)\n", debugstr_a(path), volume, size);

if (!path || !(pathW = FILE_name_AtoW( path, TRUE )))
         return FALSE;
@@ -415,7 +415,7 @@ BOOL WINAPI GetVolumePathNameA(LPCSTR filename, LPSTR volumepathname, DWORD bufl
     BOOL ret;
     WCHAR *filenameW = NULL, *volumeW = NULL;

-    TRACE("(%s, %p, %d)\n", debugstr_a(filename), volumepathname, buflen);
+    TRACE("(%s, %p, %ld)\n", debugstr_a(filename), volumepathname, buflen);

if (filename && !(filenameW = FILE_name_AtoW( filename, FALSE )))
         return FALSE;
@@ -506,7 +506,7 @@ BOOL WINAPI FindNextVolumeA( HANDLE handle, LPSTR volume, DWORD len )
  */
 HANDLE WINAPI FindFirstVolumeMountPointA(LPCSTR root, LPSTR mount_point, DWORD len)
 {
-    FIXME("(%s, %p, %d), stub!\n", debugstr_a(root), mount_point, len);
+    FIXME("(%s, %p, %ld), stub!\n", debugstr_a(root), mount_point, len);
     SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
     return INVALID_HANDLE_VALUE;
 }
@@ -516,7 +516,7 @@ HANDLE WINAPI FindFirstVolumeMountPointA(LPCSTR root, LPSTR mount_point, DWORD l
  */
 HANDLE WINAPI FindFirstVolumeMountPointW(LPCWSTR root, LPWSTR mount_point, DWORD len)
 {
-    FIXME("(%s, %p, %d), stub!\n", debugstr_w(root), mount_point, len);
+    FIXME("(%s, %p, %ld), stub!\n", debugstr_w(root), mount_point, len);
     SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
     return INVALID_HANDLE_VALUE;
 }

[PATCH 18/23] dlls/kernelbase: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech

---
 dlls/kernelbase/Makefile.in |    2 -
 dlls/kernelbase/console.c   |   42 ++++++++--------
 dlls/kernelbase/debug.c     |   38 +++++++--------
 dlls/kernelbase/file.c      |   80 ++++++++++++++++---------------
 dlls/kernelbase/loader.c    |   28 +++++------
 dlls/kernelbase/locale.c    |   62 ++++++++++++------------
 dlls/kernelbase/main.c      |   12 ++---
 dlls/kernelbase/memory.c    |   28 +++++------
 dlls/kernelbase/path.c      |   78 +++++++++++++++---------------
 dlls/kernelbase/process.c   |   22 ++++-----
 dlls/kernelbase/registry.c  |  110 ++++++++++++++++++++++---------------------
 dlls/kernelbase/security.c  |   52 ++++++++++----------
 dlls/kernelbase/string.c    |   14 +++--
 dlls/kernelbase/sync.c      |   26 +++++-----
 dlls/kernelbase/thread.c    |    2 -
 dlls/kernelbase/version.c   |   42 ++++++++--------
 dlls/kernelbase/volume.c    |   18 ++++---
 17 files changed, 328 insertions(+), 328 deletions(-)

diff --git a/dlls/kernelbase/Makefile.in b/dlls/kernelbase/Makefile.in
index c9b5d94c700..ddd301d5e65 100644
--- a/dlls/kernelbase/Makefile.in
+++ b/dlls/kernelbase/Makefile.in
@@ -1,4 +1,4 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES -DWINBASEAPI=
+EXTRADEFS = -DWINBASEAPI=
 MODULE    = kernelbase.dll
 IMPORTLIB = kernelbase
 IMPORTS   = uuid ntdll winecrt0
diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c
index b81328f705d..0cd609dbd77 100644
--- a/dlls/kernelbase/console.c
+++ b/dlls/kernelbase/console.c
@@ -72,7 +72,7 @@ struct ctrl_handler

static BOOL WINAPI default_ctrl_handler( DWORD type )
 {
-    FIXME( "Terminating process %x on event %x\n", GetCurrentProcessId(), type );
+    FIXME( "Terminating process %lx on event %lx\n", GetCurrentProcessId(), type );
     RtlExitUserProcess( 0 );
     return TRUE;
 }
@@ -285,7 +285,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH AttachConsole( DWORD pid )
 {
     BOOL ret;

-    TRACE( "(%x)\n", pid );
+    TRACE( "(%lx)\n", pid );

RtlEnterCriticalSection( &console_section );

@@ -383,7 +383,7 @@ BOOL WINAPI AllocConsole(void)
     if (!init_console_std_handles( !(app_si.dwFlags & STARTF_USESTDHANDLES) )) goto error;

RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle = console;
-    TRACE( "Started conhost pid=%08x tid=%08x\n", pi.dwProcessId, pi.dwThreadId );
+    TRACE( "Started conhost pid=%08lx tid=%08lx\n", pi.dwProcessId, pi.dwThreadId );

CloseHandle( server );
     RtlLeaveCriticalSection( &console_section );
@@ -413,7 +413,7 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateConsoleScreenBuffer( DWORD access, DWORD s
     HANDLE handle;
     NTSTATUS status;

-    TRACE( "(%x,%x,%p,%x,%p)\n", access, share, sa, flags, data );
+    TRACE( "(%lx,%lx,%p,%lx,%p)\n", access, share, sa, flags, data );

if (flags != CONSOLE_TEXTMODE_BUFFER || data)
     {
@@ -478,7 +478,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH FillConsoleOutputAttribute( HANDLE handle, WORD at
 {
     struct condrv_fill_output_params params;

-    TRACE( "(%p,%d,%d,(%dx%d),%p)\n", handle, attr, length, coord.X, coord.Y, written );
+    TRACE( "(%p,%d,%ld,(%dx%d),%p)\n", handle, attr, length, coord.X, coord.Y, written );

if (!written)
     {
@@ -521,7 +521,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH FillConsoleOutputCharacterW( HANDLE handle, WCHAR
 {
     struct condrv_fill_output_params params;

-    TRACE( "(%p,%s,%d,(%dx%d),%p)\n", handle, debugstr_wn(&ch, 1), length, coord.X, coord.Y, written );
+    TRACE( "(%p,%s,%ld,(%dx%d),%p)\n", handle, debugstr_wn(&ch, 1), length, coord.X, coord.Y, written );

if (!written)
     {
@@ -573,11 +573,11 @@ BOOL WINAPI DECLSPEC_HOTPATCH GenerateConsoleCtrlEvent( DWORD event, DWORD group
 {
     struct condrv_ctrl_event ctrl_event;

-    TRACE( "(%d, %x)\n", event, group );
+    TRACE( "(%ld, %lx)\n", event, group );

if (event != CTRL_C_EVENT && event != CTRL_BREAK_EVENT)
     {
-	ERR( "Invalid event %d for PGID %x\n", event, group );
+	ERR( "Invalid event %ld for PGID %lx\n", event, group );
    return FALSE;
     }

@@ -620,7 +620,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetConsoleCursorInfo( HANDLE handle, CONSOLE_CURSO

info->dwSize   = condrv_info.cursor_size;
     info->bVisible = condrv_info.cursor_visible;
-    TRACE("(%p) returning (%d,%d)\n", handle, info->dwSize, info->bVisible);
+    TRACE("(%p) returning (%ld,%d)\n", handle, info->dwSize, info->bVisible);
     return TRUE;
 }

@@ -835,7 +835,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH ReadConsoleOutputAttribute( HANDLE handle, WORD *a
     struct condrv_output_params params;
     BOOL ret;

-    TRACE( "(%p,%p,%d,%dx%d,%p)\n", handle, attr, length, coord.X, coord.Y, count );
+    TRACE( "(%p,%p,%ld,%dx%d,%p)\n", handle, attr, length, coord.X, coord.Y, count );

if (!count)
     {
@@ -895,7 +895,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH ReadConsoleOutputCharacterW( HANDLE handle, LPWSTR
     struct condrv_output_params params;
     BOOL ret;

-    TRACE( "(%p,%p,%d,%dx%d,%p)\n", handle, buffer, length, coord.X, coord.Y, count );
+    TRACE( "(%p,%p,%ld,%dx%d,%p)\n", handle, buffer, length, coord.X, coord.Y, count );

if (!count)
     {
@@ -1117,7 +1117,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleCursorInfo( HANDLE handle, CONSOLE_CURSO
 {
     struct condrv_output_info_params params = { SET_CONSOLE_OUTPUT_INFO_CURSOR_GEOM };

-    TRACE( "(%p,%d,%d)\n", handle, info->dwSize, info->bVisible);
+    TRACE( "(%p,%ld,%d)\n", handle, info->dwSize, info->bVisible);

params.info.cursor_size    = info->dwSize;
     params.info.cursor_visible = info->bVisible;
@@ -1180,7 +1180,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleInputExeNameW( LPCWSTR name )
  */
 BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleMode( HANDLE handle, DWORD mode )
 {
-    TRACE( "(%p,%x)\n", handle, mode );
+    TRACE( "(%p,%lx)\n", handle, mode );
     return console_ioctl( handle, IOCTL_CONDRV_SET_MODE, &mode, sizeof(mode), NULL, 0, NULL );
 }

@@ -1402,7 +1402,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleInputA( HANDLE handle, const INPUT_REC
 BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleInputW( HANDLE handle, const INPUT_RECORD *buffer,
                                                   DWORD count, DWORD *written )
 {
-    TRACE( "(%p,%p,%d,%p)\n", handle, buffer, count, written );
+    TRACE( "(%p,%p,%ld,%p)\n", handle, buffer, count, written );

if (count > 0 && !buffer)
     {
@@ -1515,7 +1515,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleOutputAttribute( HANDLE handle, const
     size_t size;
     BOOL ret;

-    TRACE( "(%p,%p,%d,%dx%d,%p)\n", handle, attr, length, coord.X, coord.Y, written );
+    TRACE( "(%p,%p,%ld,%dx%d,%p)\n", handle, attr, length, coord.X, coord.Y, written );

if ((length > 0 && !attr) || !written)
     {
@@ -1547,7 +1547,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleOutputCharacterA( HANDLE handle, LPCST
     LPWSTR strW = NULL;
     DWORD lenW = 0;

-    TRACE( "(%p,%s,%d,%dx%d,%p)\n", handle, debugstr_an(str, length), length, coord.X, coord.Y, written );
+    TRACE( "(%p,%s,%ld,%dx%d,%p)\n", handle, debugstr_an(str, length), length, coord.X, coord.Y, written );

if (length > 0)
     {
@@ -1582,7 +1582,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleOutputCharacterW( HANDLE handle, LPCWS
     size_t size;
     BOOL ret;

-    TRACE( "(%p,%s,%d,%dx%d,%p)\n", handle, debugstr_wn(str, length), length, coord.X, coord.Y, written );
+    TRACE( "(%p,%s,%ld,%dx%d,%p)\n", handle, debugstr_wn(str, length), length, coord.X, coord.Y, written );

if ((length > 0 && !str) || !written)
     {
@@ -1626,7 +1626,7 @@ BOOL WINAPI ReadConsoleW( HANDLE handle, void *buffer, DWORD length, DWORD *coun
 {
     BOOL ret;

-    TRACE( "(%p,%p,%d,%p,%p)\n", handle, buffer, length, count, reserved );
+    TRACE( "(%p,%p,%ld,%p,%p)\n", handle, buffer, length, count, reserved );

if (length > INT_MAX)
     {
@@ -1649,7 +1649,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleA( HANDLE handle, const void *buffer,
 {
     BOOL ret;

-    TRACE( "(%p,%s,%d,%p,%p)\n", handle, debugstr_an(buffer, length), length, written, reserved );
+    TRACE( "(%p,%s,%ld,%p,%p)\n", handle, debugstr_an(buffer, length), length, written, reserved );

ret = console_ioctl( handle, IOCTL_CONDRV_WRITE_FILE, (void *)buffer, length, NULL, 0, NULL );
     if (written) *written = ret ? length : 0;
@@ -1665,7 +1665,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleW( HANDLE handle, const void *buffer,
 {
     BOOL ret;

-    TRACE( "(%p,%s,%d,%p,%p)\n", handle, debugstr_wn(buffer, length), length, written, reserved );
+    TRACE( "(%p,%s,%ld,%p,%p)\n", handle, debugstr_wn(buffer, length), length, written, reserved );

ret = console_ioctl( handle, IOCTL_CONDRV_WRITE_CONSOLE, (void *)buffer,
                          length * sizeof(WCHAR), NULL, 0, NULL );
@@ -1760,7 +1760,7 @@ HRESULT WINAPI CreatePseudoConsole( COORD size, HANDLE input, HANDLE output, DWO
     HANDLE signal = NULL;
     WCHAR pipe_name[64];

-    TRACE( "(%u,%u) %p %p %x %p\n", size.X, size.Y, input, output, flags, ret );
+    TRACE( "(%u,%u) %p %p %lx %p\n", size.X, size.Y, input, output, flags, ret );

if (!size.X || !size.Y || !ret) return E_INVALIDARG;

diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c
index 74709bef89a..6848d5af125 100644
--- a/dlls/kernelbase/debug.c
+++ b/dlls/kernelbase/debug.c
@@ -366,14 +366,14 @@ static void format_exception_msg( const EXCEPTION_POINTERS *ptr, char *buffer, i
             len = snprintf( buffer, size, "Unimplemented function %s.%s called",
                             (char *)rec->ExceptionInformation[0], (char *)rec->ExceptionInformation[1] );
         else
-            len = snprintf( buffer, size, "Unimplemented function %s.%ld called",
+            len = snprintf( buffer, size, "Unimplemented function %s.%Id called",
                             (char *)rec->ExceptionInformation[0], rec->ExceptionInformation[1] );
         break;
     case EXCEPTION_WINE_ASSERTION:
         len = snprintf( buffer, size, "Assertion failed" );
         break;
     default:
-        len = snprintf( buffer, size, "Unhandled exception 0x%08x in thread %x",
+        len = snprintf( buffer, size, "Unhandled exception 0x%08lx in thread %lx",
                         rec->ExceptionCode, GetCurrentThreadId());
         break;
     }
@@ -400,7 +400,7 @@ static BOOL start_debugger( EXCEPTION_POINTERS *epointers, HANDLE event )
     char buffer[256];

format_exception_msg( epointers, buffer, sizeof(buffer) );
-    MESSAGE( "wine: %s (thread %04x), starting debugger...\n", buffer, GetCurrentThreadId() );
+    MESSAGE( "wine: %s (thread %04lx), starting debugger...\n", buffer, GetCurrentThreadId() );

attr.Length = sizeof(attr);
     attr.RootDirectory = 0;
@@ -525,7 +525,7 @@ static BOOL start_debugger( EXCEPTION_POINTERS *epointers, HANDLE event )
         WaitForMultipleObjects( 2, handles, FALSE, INFINITE );
         CloseHandle( info.hProcess );
     }
-    else ERR( "Couldn't start debugger %s (%d)\n"
+    else ERR( "Couldn't start debugger %s (%ld)\n"
               "Read the Wine Developers Guide on how to set up winedbg or another debugger\n",
               debugstr_w(cmdline), GetLastError() );
 exit:
@@ -671,7 +671,7 @@ HRESULT WINAPI /* DECLSPEC_HOTPATCH */ WerGetFlags( HANDLE process, DWORD *flags
 HRESULT WINAPI /* DECLSPEC_HOTPATCH */ WerRegisterFile( const WCHAR *file, WER_REGISTER_FILE_TYPE type,
                                                         DWORD flags )
 {
-    FIXME( "(%s, %d, %d) stub\n", debugstr_w(file), type, flags );
+    FIXME( "(%s, %d, %ld) stub\n", debugstr_w(file), type, flags );
     return E_NOTIMPL;
 }

@@ -681,7 +681,7 @@ HRESULT WINAPI /* DECLSPEC_HOTPATCH */ WerRegisterFile( const WCHAR *file, WER_R
  */
 HRESULT WINAPI /* DECLSPEC_HOTPATCH */ WerRegisterMemoryBlock( void *block, DWORD size )
 {
-    FIXME( "(%p %d) stub\n", block, size );
+    FIXME( "(%p %ld) stub\n", block, size );
     return E_NOTIMPL;
 }

@@ -701,7 +701,7 @@ HRESULT WINAPI /* DECLSPEC_HOTPATCH */ WerRegisterRuntimeExceptionModule( const
  */
 HRESULT WINAPI /* DECLSPEC_HOTPATCH */ WerSetFlags( DWORD flags )
 {
-    FIXME("(%d) stub\n", flags);
+    FIXME("(%ld) stub\n", flags);
     return S_OK;
 }

@@ -894,7 +894,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH EmptyWorkingSet( HANDLE process )
  */
 BOOL WINAPI EnumDeviceDrivers( void **image_base, DWORD count, DWORD *needed )
 {
-    FIXME( "(%p, %d, %p): stub\n", image_base, count, needed );
+    FIXME( "(%p, %ld, %p): stub\n", image_base, count, needed );
     if (needed) *needed = 0;
     return TRUE;
 }
@@ -1002,7 +1002,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH EnumProcessModules( HANDLE process, HMODULE *modul
 BOOL WINAPI EnumProcessModulesEx( HANDLE process, HMODULE *module, DWORD count,
                                   DWORD *needed, DWORD filter )
 {
-    FIXME( "(%p, %p, %d, %p, %d) semi-stub\n", process, module, count, needed, filter );
+    FIXME( "(%p, %p, %ld, %p, %ld) semi-stub\n", process, module, count, needed, filter );
     return EnumProcessModules( process, module, count, needed );
 }

@@ -1050,7 +1050,7 @@ BOOL WINAPI EnumProcesses( DWORD *ids, DWORD count, DWORD *used )
  */
 DWORD WINAPI DECLSPEC_HOTPATCH GetDeviceDriverBaseNameA( void *image_base, char *name, DWORD size )
 {
-    FIXME( "(%p, %p, %d): stub\n", image_base, name, size );
+    FIXME( "(%p, %p, %ld): stub\n", image_base, name, size );
     if (name && size) name[0] = 0;
     return 0;
 }
@@ -1062,7 +1062,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetDeviceDriverBaseNameA( void *image_base, char
  */
 DWORD WINAPI DECLSPEC_HOTPATCH GetDeviceDriverBaseNameW( void *image_base, WCHAR *name, DWORD size )
 {
-    FIXME( "(%p, %p, %d): stub\n", image_base, name, size );
+    FIXME( "(%p, %p, %ld): stub\n", image_base, name, size );
     if (name && size) name[0] = 0;
     return 0;
 }
@@ -1074,7 +1074,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetDeviceDriverBaseNameW( void *image_base, WCHAR
  */
 DWORD WINAPI DECLSPEC_HOTPATCH GetDeviceDriverFileNameA( void *image_base, char *name, DWORD size )
 {
-    FIXME( "(%p, %p, %d): stub\n", image_base, name, size );
+    FIXME( "(%p, %p, %ld): stub\n", image_base, name, size );
     if (name && size) name[0] = 0;
     return 0;
 }
@@ -1086,7 +1086,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetDeviceDriverFileNameA( void *image_base, char
  */
 DWORD WINAPI DECLSPEC_HOTPATCH GetDeviceDriverFileNameW( void *image_base, WCHAR *name, DWORD size )
 {
-    FIXME( "(%p, %p, %d): stub\n", image_base, name, size );
+    FIXME( "(%p, %p, %ld): stub\n", image_base, name, size );
     if (name && size) name[0] = 0;
     return 0;
 }
@@ -1163,7 +1163,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetModuleBaseNameA( HANDLE process, HMODULE modul
     if (!(name_w = HeapAlloc( GetProcessHeap(), 0, sizeof(WCHAR) * size ))) return 0;

len = GetModuleBaseNameW( process, module, name_w, size );
-    TRACE( "%d, %s\n", len, debugstr_w(name_w) );
+    TRACE( "%ld, %s\n", len, debugstr_w(name_w) );
     if (len)
     {
         ret = WideCharToMultiByte( CP_ACP, 0, name_w, len, name, size, NULL, NULL );
@@ -1220,7 +1220,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetModuleFileNameExA( HANDLE process, HMODULE mod
     WCHAR *ptr;
     DWORD len;

-    TRACE( "(process=%p, module=%p, %p, %d)\n", process, module, name, size );
+    TRACE( "(process=%p, module=%p, %p, %ld)\n", process, module, name, size );

if (!name || !size)
     {
@@ -1352,7 +1352,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetPerformanceInfo( PPERFORMANCE_INFORMATION info,
     DWORD info_size;
     NTSTATUS status;

-    TRACE( "(%p, %d)\n", info, size );
+    TRACE( "(%p, %ld)\n", info, size );

if (size < sizeof(*info))
     {
@@ -1469,7 +1469,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetProcessMemoryInfo( HANDLE process, PROCESS_MEMO
  */
 BOOL WINAPI DECLSPEC_HOTPATCH GetWsChanges( HANDLE process, PSAPI_WS_WATCH_INFORMATION *info, DWORD size )
 {
-    TRACE( "(%p, %p, %d)\n", process, info, size );
+    TRACE( "(%p, %p, %ld)\n", process, info, size );
     return set_ntstatus( NtQueryInformationProcess( process, ProcessWorkingSetWatch, info, size, NULL ));
 }

@@ -1504,7 +1504,7 @@ BOOL WINAPI /* DECLSPEC_HOTPATCH */ InitializeProcessForWsWatch( HANDLE process
  */
 BOOL WINAPI DECLSPEC_HOTPATCH QueryWorkingSet( HANDLE process, void *buffer, DWORD size )
 {
-    TRACE( "(%p, %p, %d)\n", process, buffer, size );
+    TRACE( "(%p, %p, %ld)\n", process, buffer, size );
     return set_ntstatus( NtQueryVirtualMemory( process, NULL, MemoryWorkingSetInformation,
                                                buffer, size, NULL ));
 }
@@ -1516,7 +1516,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH QueryWorkingSet( HANDLE process, void *buffer, DWO
  */
 BOOL WINAPI QueryWorkingSetEx( HANDLE process, void *buffer, DWORD size )
 {
-    TRACE( "(%p, %p, %d)\n", process, buffer, size );
+    TRACE( "(%p, %p, %ld)\n", process, buffer, size );
     return set_ntstatus( NtQueryVirtualMemory( process, NULL, MemoryWorkingSetExInformation,
                                                buffer, size, NULL ));
 }
diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c
index 576e03eb62b..c6dc904044a 100644
--- a/dlls/kernelbase/file.c
+++ b/dlls/kernelbase/file.c
@@ -516,7 +516,7 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT
         return FALSE;
     }

-    TRACE("%s -> %s, %x\n", debugstr_w(source), debugstr_w(dest), flags);
+    TRACE("%s -> %s, %lx\n", debugstr_w(source), debugstr_w(dest), flags);

if ((h1 = CreateFileW( source, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
                            NULL, OPEN_EXISTING, 0, 0 )) == INVALID_HANDLE_VALUE)
@@ -682,10 +682,10 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateFile2( LPCWSTR name, DWORD access, DWORD s
     DWORD attributes = params ? params->dwFileAttributes : 0;
     DWORD flags = params ? params->dwFileFlags : 0;

-    FIXME( "(%s %x %x %x %p), partial stub\n", debugstr_w(name), access, sharing, creation, params );
+    FIXME( "(%s %lx %lx %lx %p), partial stub\n", debugstr_w(name), access, sharing, creation, params );

-    if (attributes & ~attributes_mask) FIXME( "unsupported attributes %#x\n", attributes );
-    if (flags & ~flags_mask) FIXME( "unsupported flags %#x\n", flags );
+    if (attributes & ~attributes_mask) FIXME( "unsupported attributes %#lx\n", attributes );
+    if (flags & ~flags_mask) FIXME( "unsupported flags %#lx\n", flags );
     attributes &= attributes_mask;
     flags &= flags_mask;

@@ -763,7 +763,7 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateFileW( LPCWSTR filename, DWORD access, DWO
         return INVALID_HANDLE_VALUE;
     }

-    TRACE( "%s %s%s%s%s%s%s%s creation %d attributes 0x%x\n", debugstr_w(filename),
+    TRACE( "%s %s%s%s%s%s%s%s creation %ld attributes 0x%lx\n", debugstr_w(filename),
            (access & GENERIC_READ) ? "GENERIC_READ " : "",
            (access & GENERIC_WRITE) ? "GENERIC_WRITE " : "",
            (access & GENERIC_EXECUTE) ? "GENERIC_EXECUTE " : "",
@@ -831,7 +831,7 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateFileW( LPCWSTR filename, DWORD access, DWO
             if (vxd_open && (ret = vxd_open( vxd_name, access, sa ))) goto done;
         }

-        WARN("Unable to create file %s (status %x)\n", debugstr_w(filename), status);
+        WARN("Unable to create file %s (status %lx)\n", debugstr_w(filename), status);
         ret = INVALID_HANDLE_VALUE;

/* In the case file creation was rejected due to CREATE_NEW flag
@@ -938,7 +938,7 @@ done:
  */
 BOOLEAN WINAPI /* DECLSPEC_HOTPATCH */ CreateSymbolicLinkW( LPCWSTR link, LPCWSTR target, DWORD flags )
 {
-    FIXME( "(%s %s %d): stub\n", debugstr_w(link), debugstr_w(target), flags );
+    FIXME( "(%s %s %ld): stub\n", debugstr_w(link), debugstr_w(target), flags );
     return TRUE;
 }

@@ -1029,7 +1029,7 @@ HANDLE WINAPI DECLSPEC_HOTPATCH FindFirstChangeNotificationW( LPCWSTR path, BOOL
     NTSTATUS status;
     HANDLE handle = INVALID_HANDLE_VALUE;

-    TRACE( "%s %d %x\n", debugstr_w(path), subtree, filter );
+    TRACE( "%s %d %lx\n", debugstr_w(path), subtree, filter );

if (!RtlDosPathNameToNtPathName_U( path, &nt_name, NULL, NULL ))
     {
@@ -1120,11 +1120,11 @@ HANDLE WINAPI DECLSPEC_HOTPATCH FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_
     NTSTATUS status;
     DWORD size, device = 0;

-    TRACE( "%s %d %p %d %p %x\n", debugstr_w(filename), level, data, search_op, filter, flags );
+    TRACE( "%s %d %p %d %p %lx\n", debugstr_w(filename), level, data, search_op, filter, flags );

if (flags & ~FIND_FIRST_EX_LARGE_FETCH)
     {
-        FIXME("flags not implemented 0x%08x\n", flags );
+        FIXME("flags not implemented 0x%08lx\n", flags );
     }
     if (search_op != FindExSearchNameMatch && search_op != FindExSearchLimitToDirectories)
     {
@@ -1300,7 +1300,7 @@ HANDLE WINAPI DECLSPEC_HOTPATCH FindFirstFileW( const WCHAR *filename, WIN32_FIN
  */
 HANDLE WINAPI FindFirstStreamW( const WCHAR *filename, STREAM_INFO_LEVELS level, void *data, DWORD flags )
 {
-    FIXME("(%s, %d, %p, %x): stub!\n", debugstr_w(filename), level, data, flags);
+    FIXME("(%s, %d, %p, %lx): stub!\n", debugstr_w(filename), level, data, flags);
     SetLastError( ERROR_HANDLE_EOF );
     return INVALID_HANDLE_VALUE;
 }
@@ -1683,7 +1683,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetFinalPathNameByHandleA( HANDLE file, LPSTR pat
     WCHAR *str;
     DWORD result, len;

-    TRACE( "(%p,%p,%d,%x)\n", file, path, count, flags);
+    TRACE( "(%p,%p,%ld,%lx)\n", file, path, count, flags);

len = GetFinalPathNameByHandleW(file, NULL, 0, flags);
     if (len == 0) return 0;
@@ -1729,11 +1729,11 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetFinalPathNameByHandleW( HANDLE file, LPWSTR pa
     ULONG dummy;
     WCHAR *ptr;

-    TRACE( "(%p,%p,%d,%x)\n", file, path, count, flags );
+    TRACE( "(%p,%p,%ld,%lx)\n", file, path, count, flags );

if (flags & ~(FILE_NAME_OPENED | VOLUME_NAME_GUID | VOLUME_NAME_NONE | VOLUME_NAME_NT))
     {
-        WARN("Unknown flags: %x\n", flags);
+        WARN("Unknown flags: %lx\n", flags);
         SetLastError( ERROR_INVALID_PARAMETER );
         return 0;
     }
@@ -1846,7 +1846,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetFinalPathNameByHandleW( HANDLE file, LPWSTR pa
     else
     {
         /* Windows crashes here, but we prefer returning ERROR_INVALID_PARAMETER */
-        WARN("Invalid combination of flags: %x\n", flags);
+        WARN("Invalid combination of flags: %lx\n", flags);
         SetLastError( ERROR_INVALID_PARAMETER );
     }
     return result;
@@ -1930,7 +1930,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetLongPathNameW( LPCWSTR shortpath, LPWSTR longp
     LPCWSTR p;
     HANDLE handle;

-    TRACE("%s,%p,%u\n", debugstr_w(shortpath), longpath, longlen);
+    TRACE("%s,%p,%lu\n", debugstr_w(shortpath), longpath, longlen);

if (!shortpath)
     {
@@ -2037,7 +2037,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetShortPathNameW( LPCWSTR longpath, LPWSTR short
     LPCWSTR p;
     DWORD sp = 0, lp = 0, tmplen, buf_len;

-    TRACE( "%s,%p,%u\n", debugstr_w(longpath), shortpath, shortlen );
+    TRACE( "%s,%p,%lu\n", debugstr_w(longpath), shortpath, shortlen );

if (!longpath)
     {
@@ -2438,7 +2438,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH MoveFileWithProgressW( const WCHAR *source, const
     HANDLE source_handle = 0;
     ULONG size;

-    TRACE( "(%s,%s,%p,%p,%04x)\n", debugstr_w(source), debugstr_w(dest), progress, param, flag );
+    TRACE( "(%s,%s,%p,%p,%04lx)\n", debugstr_w(source), debugstr_w(dest), progress, param, flag );

if (flag & MOVEFILE_DELAY_UNTIL_REBOOT) return add_boot_rename_entry( source, dest, flag );

@@ -2540,10 +2540,10 @@ BOOL WINAPI DECLSPEC_HOTPATCH ReplaceFileW( const WCHAR *replaced, const WCHAR *
     OBJECT_ATTRIBUTES attr;
     FILE_BASIC_INFORMATION info;

-    TRACE( "%s %s %s 0x%08x %p %p\n", debugstr_w(replaced), debugstr_w(replacement), debugstr_w(backup),
+    TRACE( "%s %s %s 0x%08lx %p %p\n", debugstr_w(replaced), debugstr_w(replacement), debugstr_w(backup),
            flags, exclude, reserved );

-    if (flags) FIXME("Ignoring flags %x\n", flags);
+    if (flags) FIXME("Ignoring flags %lx\n", flags);

/* First two arguments are mandatory */
     if (!replaced || !replacement)
@@ -2811,7 +2811,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetFileAttributesW( LPCWSTR name, DWORD attributes
     NTSTATUS status;
     HANDLE handle;

-    TRACE( "%s %x\n", debugstr_w(name), attributes );
+    TRACE( "%s %lx\n", debugstr_w(name), attributes );

if (!RtlDosPathNameToNtPathName_U( name, &nt_name, NULL, NULL ))
     {
@@ -2965,7 +2965,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetFileInformationByHandleEx( HANDLE handle, FILE_
     case FileAlignmentInfo:
     case FileIdExtdDirectoryInfo:
     case FileIdExtdDirectoryRestartInfo:
-        FIXME( "%p, %u, %p, %u\n", handle, class, info, size );
+        FIXME( "%p, %u, %p, %lu\n", handle, class, info, size );
         SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
         return FALSE;

@@ -3123,7 +3123,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetOverlappedResultEx( HANDLE file, OVERLAPPED *ov
     NTSTATUS status;
     DWORD ret;

-    TRACE( "(%p %p %p %u %d)\n", file, overlapped, result, timeout, alertable );
+    TRACE( "(%p %p %p %lu %d)\n", file, overlapped, result, timeout, alertable );

status = overlapped->Internal;
     if (status == STATUS_PENDING)
@@ -3159,7 +3159,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH LockFile( HANDLE file, DWORD offset_low, DWORD off
 {
     LARGE_INTEGER count, offset;

-    TRACE( "%p %x%08x %x%08x\n", file, offset_high, offset_low, count_high, count_low );
+    TRACE( "%p %lx%08lx %lx%08lx\n", file, offset_high, offset_low, count_high, count_low );

count.u.LowPart = count_low;
     count.u.HighPart = count_high;
@@ -3184,7 +3184,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH LockFileEx( HANDLE file, DWORD flags, DWORD reserv
         return FALSE;
     }

-    TRACE( "%p %x%08x %x%08x flags %x\n",
+    TRACE( "%p %lx%08lx %lx%08lx flags %lx\n",
            file, overlapped->u.s.OffsetHigh, overlapped->u.s.Offset, count_high, count_low, flags );

count.u.LowPart = count_low;
@@ -3259,7 +3259,7 @@ HANDLE WINAPI DECLSPEC_HOTPATCH ReOpenFile( HANDLE handle, DWORD access, DWORD s
     NTSTATUS status;
     HANDLE file;

-    TRACE("handle %p, access %#x, sharing %#x, attributes %#x.\n", handle, access, sharing, attributes);
+    TRACE("handle %p, access %#lx, sharing %#lx, attributes %#lx.\n", handle, access, sharing, attributes);

if (attributes & 0x7ffff) /* FILE_ATTRIBUTE_* flags are invalid */
     {
@@ -3307,7 +3307,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH ReadDirectoryChangesW( HANDLE handle, LPVOID buffe
     NTSTATUS status;
     LPVOID cvalue = NULL;

-    TRACE( "%p %p %08x %d %08x %p %p %p\n",
+    TRACE( "%p %p %08lx %d %08lx %p %p %p\n",
            handle, buffer, len, subtree, filter, returned, overlapped, completion );

if (!overlapped)
@@ -3355,7 +3355,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH ReadFile( HANDLE file, LPVOID buffer, DWORD count,
     NTSTATUS status;
     LPVOID cvalue = NULL;

-    TRACE( "%p %p %d %p %p\n", file, buffer, count, result, overlapped );
+    TRACE( "%p %p %ld %p %p\n", file, buffer, count, result, overlapped );

if (result) *result = 0;

@@ -3408,7 +3408,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH ReadFileEx( HANDLE file, LPVOID buffer, DWORD coun
     LARGE_INTEGER offset;
     NTSTATUS status;

-    TRACE( "(file=%p, buffer=%p, bytes=%u, ovl=%p, ovl_fn=%p)\n",
+    TRACE( "(file=%p, buffer=%p, bytes=%lu, ovl=%p, ovl_fn=%p)\n",
            file, buffer, count, overlapped, completion );

if (!overlapped)
@@ -3438,7 +3438,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH ReadFileScatter( HANDLE file, FILE_SEGMENT_ELEMENT
     LARGE_INTEGER offset;
     void *cvalue = NULL;

-    TRACE( "(%p %p %u %p)\n", file, segments, count, overlapped );
+    TRACE( "(%p %p %lu %p)\n", file, segments, count, overlapped );

offset.u.LowPart = overlapped->u.s.Offset;
     offset.u.HighPart = overlapped->u.s.OffsetHigh;
@@ -3524,7 +3524,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetFileInformationByHandle( HANDLE file, FILE_INFO
     NTSTATUS status;
     IO_STATUS_BLOCK io;

-    TRACE( "%p %u %p %u\n", file, class, info, size );
+    TRACE( "%p %u %p %lu\n", file, class, info, size );

switch (class)
     {
@@ -3540,7 +3540,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetFileInformationByHandle( HANDLE file, FILE_INFO
     case FileIdInfo:
     case FileIdExtdDirectoryInfo:
     case FileIdExtdDirectoryRestartInfo:
-        FIXME( "%p, %u, %p, %u\n", file, class, info, size );
+        FIXME( "%p, %u, %p, %lu\n", file, class, info, size );
         SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
         return FALSE;

@@ -3752,7 +3752,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteFile( HANDLE file, LPCVOID buffer, DWORD coun
     PIO_STATUS_BLOCK piosb = &iosb;
     LPVOID cvalue = NULL;

-    TRACE( "%p %p %d %p %p\n", file, buffer, count, result, overlapped );
+    TRACE( "%p %p %ld %p %p\n", file, buffer, count, result, overlapped );

if (overlapped)
     {
@@ -3796,7 +3796,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteFileEx( HANDLE file, LPCVOID buffer,
     NTSTATUS status;
     PIO_STATUS_BLOCK io;

-    TRACE( "%p %p %d %p %p\n", file, buffer, count, overlapped, completion );
+    TRACE( "%p %p %ld %p %p\n", file, buffer, count, overlapped, completion );

if (!overlapped)
     {
@@ -3826,7 +3826,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteFileGather( HANDLE file, FILE_SEGMENT_ELEMENT
     LARGE_INTEGER offset;
     void *cvalue = NULL;

-    TRACE( "%p %p %u %p\n", file, segments, count, overlapped );
+    TRACE( "%p %p %lu %p\n", file, segments, count, overlapped );

offset.u.LowPart = overlapped->u.s.Offset;
     offset.u.HighPart = overlapped->u.s.OffsetHigh;
@@ -4027,7 +4027,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH SystemTimeToFileTime( const SYSTEMTIME *systime, F

static void dump_dcb( const DCB *dcb )
 {
-    TRACE( "size=%d rate=%d fParity=%d Parity=%d stopbits=%d %sIXON %sIXOFF CTS=%d RTS=%d DSR=%d DTR=%d %sCRTSCTS\n",
+    TRACE( "size=%d rate=%ld fParity=%d Parity=%d stopbits=%d %sIXON %sIXOFF CTS=%d RTS=%d DSR=%d DTR=%d %sCRTSCTS\n",
            dcb->ByteSize, dcb->BaudRate, dcb->fParity, dcb->Parity,
            (dcb->StopBits == ONESTOPBIT) ? 1 : (dcb->StopBits == TWOSTOPBITS) ? 2 : 0,
            dcb->fOutX ? "" : "~", dcb->fInX ? "" : "~",
@@ -4054,7 +4054,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH ClearCommError( HANDLE handle, DWORD *errors, COMS
     if (!DeviceIoControl( handle, IOCTL_SERIAL_GET_COMMSTATUS, NULL, 0, &ss, sizeof(ss), NULL, NULL ))
         return FALSE;

-    TRACE( "status %#x,%#x, in %u, out %u, eof %d, wait %d\n", ss.Errors, ss.HoldReasons,
+    TRACE( "status %#lx,%#lx, in %lu, out %lu, eof %d, wait %d\n", ss.Errors, ss.HoldReasons,
            ss.AmountInInQueue, ss.AmountInOutQueue, ss.EofReceived, ss.WaitForImmediate );

if (errors)
@@ -4094,7 +4094,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH DeviceIoControl( HANDLE handle, DWORD code, void *
     HANDLE event = 0;
     NTSTATUS status;

-    TRACE( "(%p,%x,%p,%d,%p,%d,%p,%p)\n",
+    TRACE( "(%p,%lx,%p,%ld,%p,%ld,%p,%p)\n",
            handle, code, in_buff, in_count, out_buff, out_count, returned, overlapped );

if (overlapped)
@@ -4154,7 +4154,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetCommConfig( HANDLE handle, COMMCONFIG *config,
 {
     if (!config) return FALSE;

-    TRACE( "(%p, %p, %p %u)\n", handle, config, size, *size );
+    TRACE( "(%p, %p, %p %lu)\n", handle, config, size, *size );

if (*size < sizeof(COMMCONFIG))
     {
@@ -4304,7 +4304,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetCommBreak( HANDLE handle )
  */
 BOOL WINAPI DECLSPEC_HOTPATCH SetCommConfig( HANDLE handle, COMMCONFIG *config, DWORD size )
 {
-    TRACE( "(%p, %p, %u)\n", handle, config, size );
+    TRACE( "(%p, %p, %lu)\n", handle, config, size );
     return SetCommState( handle, &config->dcb );
 }

diff --git a/dlls/kernelbase/loader.c b/dlls/kernelbase/loader.c
index de9ff2ba1a5..02d72cfbfbf 100644
--- a/dlls/kernelbase/loader.c
+++ b/dlls/kernelbase/loader.c
@@ -157,7 +157,7 @@ static HMODULE load_library( const UNICODE_STRING *libname, DWORD flags )
     HMODULE module;
     WCHAR *load_path, *dummy;

-    if (flags & unsupported_flags) FIXME( "unsupported flag(s) used %#08x\n", flags );
+    if (flags & unsupported_flags) FIXME( "unsupported flag(s) used %#08lx\n", flags );

if (!set_ntstatus( LdrGetDllPath( libname->Buffer, flags, &load_path, &dummy ))) return 0;

@@ -530,7 +530,7 @@ HMODULE WINAPI DECLSPEC_HOTPATCH LoadLibraryExW( LPCWSTR name, HANDLE file, DWOR
  */
 HMODULE WINAPI /* DECLSPEC_HOTPATCH */ LoadPackagedLibrary( LPCWSTR name, DWORD reserved )
 {
-    FIXME( "semi-stub, name %s, reserved %#x.\n", debugstr_w(name), reserved );
+    FIXME( "semi-stub, name %s, reserved %#lx.\n", debugstr_w(name), reserved );
     SetLastError( APPMODEL_ERROR_NO_PACKAGE );
     return NULL;
 }
@@ -629,11 +629,11 @@ BOOL WINAPI DECLSPEC_HOTPATCH EnumResourceLanguagesExA( HMODULE module, LPCSTR t
     const IMAGE_RESOURCE_DIRECTORY *basedir, *resdir;
     const IMAGE_RESOURCE_DIRECTORY_ENTRY *et;

-    TRACE( "%p %s %s %p %lx %x %d\n", module, debugstr_a(type), debugstr_a(name),
+    TRACE( "%p %s %s %p %Ix %lx %d\n", module, debugstr_a(type), debugstr_a(name),
            func, param, flags, lang );

if (flags & (RESOURCE_ENUM_MUI | RESOURCE_ENUM_MUI_SYSTEM | RESOURCE_ENUM_VALIDATE))
-        FIXME( "unimplemented flags: %x\n", flags );
+        FIXME( "unimplemented flags: %lx\n", flags );

if (!flags) flags = RESOURCE_ENUM_LN | RESOURCE_ENUM_MUI;
     if (!(flags & RESOURCE_ENUM_LN)) return ret;
@@ -689,11 +689,11 @@ BOOL WINAPI DECLSPEC_HOTPATCH EnumResourceLanguagesExW( HMODULE module, LPCWSTR
     const IMAGE_RESOURCE_DIRECTORY *basedir, *resdir;
     const IMAGE_RESOURCE_DIRECTORY_ENTRY *et;

-    TRACE( "%p %s %s %p %lx %x %d\n", module, debugstr_w(type), debugstr_w(name),
+    TRACE( "%p %s %s %p %Ix %lx %d\n", module, debugstr_w(type), debugstr_w(name),
            func, param, flags, lang );

if (flags & (RESOURCE_ENUM_MUI | RESOURCE_ENUM_MUI_SYSTEM | RESOURCE_ENUM_VALIDATE))
-        FIXME( "unimplemented flags: %x\n", flags );
+        FIXME( "unimplemented flags: %lx\n", flags );

if (!flags) flags = RESOURCE_ENUM_LN | RESOURCE_ENUM_MUI;
     if (!(flags & RESOURCE_ENUM_LN)) return ret;
@@ -751,10 +751,10 @@ BOOL WINAPI DECLSPEC_HOTPATCH EnumResourceNamesExA( HMODULE module, LPCSTR type,
     const IMAGE_RESOURCE_DIRECTORY_ENTRY *et;
     const IMAGE_RESOURCE_DIR_STRING_U *str;

-    TRACE( "%p %s %p %lx\n", module, debugstr_a(type), func, param );
+    TRACE( "%p %s %p %Ix\n", module, debugstr_a(type), func, param );

if (flags & (RESOURCE_ENUM_MUI | RESOURCE_ENUM_MUI_SYSTEM | RESOURCE_ENUM_VALIDATE))
-        FIXME( "unimplemented flags: %x\n", flags );
+        FIXME( "unimplemented flags: %lx\n", flags );

if (!flags) flags = RESOURCE_ENUM_LN | RESOURCE_ENUM_MUI;
     if (!(flags & RESOURCE_ENUM_LN)) return ret;
@@ -830,10 +830,10 @@ BOOL WINAPI DECLSPEC_HOTPATCH EnumResourceNamesExW( HMODULE module, LPCWSTR type
     const IMAGE_RESOURCE_DIRECTORY_ENTRY *et;
     const IMAGE_RESOURCE_DIR_STRING_U *str;

-    TRACE( "%p %s %p %lx\n", module, debugstr_w(type), func, param );
+    TRACE( "%p %s %p %Ix\n", module, debugstr_w(type), func, param );

if (flags & (RESOURCE_ENUM_MUI | RESOURCE_ENUM_MUI_SYSTEM | RESOURCE_ENUM_VALIDATE))
-        FIXME( "unimplemented flags: %x\n", flags );
+        FIXME( "unimplemented flags: %lx\n", flags );

if (!flags) flags = RESOURCE_ENUM_LN | RESOURCE_ENUM_MUI;
     if (!(flags & RESOURCE_ENUM_LN)) return ret;
@@ -915,10 +915,10 @@ BOOL WINAPI DECLSPEC_HOTPATCH EnumResourceTypesExA( HMODULE module, ENUMRESTYPEP
     const IMAGE_RESOURCE_DIRECTORY_ENTRY *et;
     const IMAGE_RESOURCE_DIR_STRING_U *str;

-    TRACE( "%p %p %lx\n", module, func, param );
+    TRACE( "%p %p %Ix\n", module, func, param );

if (flags & (RESOURCE_ENUM_MUI | RESOURCE_ENUM_MUI_SYSTEM | RESOURCE_ENUM_VALIDATE))
-        FIXME( "unimplemented flags: %x\n", flags );
+        FIXME( "unimplemented flags: %lx\n", flags );

if (!flags) flags = RESOURCE_ENUM_LN | RESOURCE_ENUM_MUI;
     if (!(flags & RESOURCE_ENUM_LN)) return ret;
@@ -968,7 +968,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH EnumResourceTypesExW( HMODULE module, ENUMRESTYPEP
     const IMAGE_RESOURCE_DIRECTORY_ENTRY *et;
     const IMAGE_RESOURCE_DIR_STRING_U *str;

-    TRACE( "%p %p %lx\n", module, func, param );
+    TRACE( "%p %p %Ix\n", module, func, param );

if (!flags) flags = RESOURCE_ENUM_LN | RESOURCE_ENUM_MUI;
     if (!(flags & RESOURCE_ENUM_LN)) return ret;
@@ -1126,7 +1126,7 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateActCtxW( PCACTCTXW ctx )
 {
     HANDLE context;

-    TRACE( "%p %08x\n", ctx, ctx ? ctx->dwFlags : 0 );
+    TRACE( "%p %08lx\n", ctx, ctx ? ctx->dwFlags : 0 );

if (!set_ntstatus( RtlCreateActivationContext( &context, ctx ))) return INVALID_HANDLE_VALUE;
     return context;
diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c
index 667d1a4dc65..2f2154a0e7c 100644
--- a/dlls/kernelbase/locale.c
+++ b/dlls/kernelbase/locale.c
@@ -810,9 +810,9 @@ void init_locale(void)
     if (!RegQueryValueExW( intl_key, L"Locale", NULL, NULL, (BYTE *)bufferW, &count ))
     {
         if (wcstoul( bufferW, NULL, 16 ) == user_lcid) return;  /* already set correctly */
-        TRACE( "updating registry, locale changed %s -> %08x\n", debugstr_w(bufferW), user_lcid );
+        TRACE( "updating registry, locale changed %s -> %08lx\n", debugstr_w(bufferW), user_lcid );
     }
-    else TRACE( "updating registry, locale changed none -> %08x\n", user_lcid );
+    else TRACE( "updating registry, locale changed none -> %08lx\n", user_lcid );
     swprintf( bufferW, ARRAY_SIZE(bufferW), L"%08x", user_lcid );
     RegSetValueExW( intl_key, L"Locale", 0, REG_SZ,
                     (BYTE *)bufferW, (lstrlenW(bufferW) + 1) * sizeof(WCHAR) );
@@ -2803,7 +2803,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH Internal_EnumDateFormats( DATEFMT_ENUMPROCW proc,
         lctype = LOCALE_SYEARMONTH;
         break;
     default:
-        FIXME( "unknown date format 0x%08x\n", flags );
+        FIXME( "unknown date format 0x%08lx\n", flags );
         SetLastError( ERROR_INVALID_PARAMETER );
         return FALSE;
     }
@@ -2946,7 +2946,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH Internal_EnumSystemLanguageGroups( LANGUAGEGROUP_E

if (!(flags & LGRPID_SUPPORTED) && !wcstoul( value, NULL, 10 )) continue;
         if (!LoadStringW( kernel32_handle, 0x2000 + id, descr, ARRAY_SIZE(descr) )) descr[0] = 0;
-        TRACE( "%p: %u %s %s %x %lx\n", proc, id, debugstr_w(name), debugstr_w(descr), flags, param );
+        TRACE( "%p: %lu %s %s %lx %Ix\n", proc, id, debugstr_w(name), debugstr_w(descr), flags, param );
         if (!unicode)
         {
             char nameA[10], descrA[80];
@@ -2985,7 +2985,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH Internal_EnumTimeFormats( TIMEFMT_ENUMPROCW proc,
         lctype = LOCALE_SSHORTTIME;
         break;
     default:
-        FIXME( "Unknown time format %x\n", flags );
+        FIXME( "Unknown time format %lx\n", flags );
         SetLastError( ERROR_INVALID_PARAMETER );
         return FALSE;
     }
@@ -3080,7 +3080,7 @@ INT WINAPI CompareStringEx( const WCHAR *locale, DWORD flags, const WCHAR *str1,

if (flags & semistub_flags)
     {
-        if (!once++) FIXME( "semi-stub behavior for flag(s) 0x%x\n", flags & semistub_flags );
+        if (!once++) FIXME( "semi-stub behavior for flag(s) 0x%lx\n", flags & semistub_flags );
     }

if (len1 < 0) len1 = lstrlenW(str1);
@@ -3380,7 +3380,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH EnumSystemGeoID( GEOCLASS class, GEOID parent, GEO
 {
     INT i;

-    TRACE( "(%d, %d, %p)\n", class, parent, proc );
+    TRACE( "(%ld, %ld, %p)\n", class, parent, proc );

if (!proc)
     {
@@ -3560,7 +3560,7 @@ INT WINAPI DECLSPEC_HOTPATCH FindNLSStringEx( const WCHAR *locale, DWORD flags,
     DWORD mask = flags;
     int offset, inc, count;

-    TRACE( "%s %x %s %d %s %d %p %p %p %ld\n", wine_dbgstr_w(locale), flags,
+    TRACE( "%s %lx %s %d %s %d %p %p %p %Id\n", wine_dbgstr_w(locale), flags,
            wine_dbgstr_w(src), srclen, wine_dbgstr_w(value), valuelen, found,
            version, reserved, handle );

@@ -3602,7 +3602,7 @@ INT WINAPI DECLSPEC_HOTPATCH FindStringOrdinal( DWORD flag, const WCHAR *src, IN
 {
     INT offset, inc, count;

-    TRACE( "%#x %s %d %s %d %d\n", flag, wine_dbgstr_w(src), src_size,
+    TRACE( "%#lx %s %d %s %d %d\n", flag, wine_dbgstr_w(src), src_size,
            wine_dbgstr_w(val), val_size, ignore_case );

if (!src || !val)
@@ -3736,7 +3736,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH FormatMessageA( DWORD flags, const void *source,
     WCHAR *result, *message = NULL;
     NTSTATUS status;

-    TRACE( "(0x%x,%p,%#x,0x%x,%p,%u,%p)\n", flags, source, msgid, langid, buffer, size, args );
+    TRACE( "(0x%lx,%p,%#lx,0x%lx,%p,%lu,%p)\n", flags, source, msgid, langid, buffer, size, args );

if (flags & FORMAT_MESSAGE_ALLOCATE_BUFFER)
     {
@@ -3818,7 +3818,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH FormatMessageW( DWORD flags, const void *source,
     WCHAR *message = NULL;
     NTSTATUS status;

-    TRACE( "(0x%x,%p,%#x,0x%x,%p,%u,%p)\n", flags, source, msgid, langid, buffer, size, args );
+    TRACE( "(0x%lx,%p,%#lx,0x%lx,%p,%lu,%p)\n", flags, source, msgid, langid, buffer, size, args );

if (!buffer)
     {
@@ -4067,14 +4067,14 @@ INT WINAPI DECLSPEC_HOTPATCH GetCalendarInfoW( LCID lcid, CALID calendar, CALTYP
         return GetLocaleInfoW( lcid, LOCALE_ICALENDARTYPE, data, count );

case CAL_SCALNAME:
-        FIXME( "Unimplemented caltype %d\n", calinfo );
+        FIXME( "Unimplemented caltype %ld\n", calinfo );
         if (data) *data = 0;
         return 1;

case CAL_IYEAROFFSETRANGE:
     case CAL_SERASTRING:
     case CAL_SABBREVERASTRING:
-        FIXME( "Unimplemented caltype %d\n", calinfo );
+        FIXME( "Unimplemented caltype %ld\n", calinfo );
         return 0;

case CAL_SSHORTDATE:
@@ -4151,7 +4151,7 @@ INT WINAPI DECLSPEC_HOTPATCH GetCalendarInfoW( LCID lcid, CALID calendar, CALTYP
         }
         break;
     default:
-        FIXME( "Unknown caltype %d\n", calinfo );
+        FIXME( "Unknown caltype %ld\n", calinfo );
         SetLastError( ERROR_INVALID_FLAGS );
         return 0;
     }
@@ -4262,7 +4262,7 @@ done:
 BOOL WINAPI /* DECLSPEC_HOTPATCH */ GetFileMUIInfo( DWORD flags, const WCHAR *path,
                                                     FILEMUIINFO *info, DWORD *size )
 {
-    FIXME( "stub: %u, %s, %p, %p\n", flags, debugstr_w(path), info, size );
+    FIXME( "stub: %lu, %s, %p, %p\n", flags, debugstr_w(path), info, size );
     SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
     return FALSE;
 }
@@ -4276,7 +4276,7 @@ BOOL WINAPI /* DECLSPEC_HOTPATCH */ GetFileMUIPath( DWORD flags, const WCHAR *fi
                                                     WCHAR *muipath, ULONG *muipathlen,
                                                     ULONGLONG *enumerator )
 {
-    FIXME( "stub: 0x%x, %s, %s, %p, %p, %p, %p\n", flags, debugstr_w(filepath),
+    FIXME( "stub: 0x%lx, %s, %s, %p, %p, %p, %p\n", flags, debugstr_w(filepath),
            debugstr_w(language), languagelen, muipath, muipathlen, enumerator );
     SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
     return FALSE;
@@ -4293,7 +4293,7 @@ INT WINAPI DECLSPEC_HOTPATCH GetGeoInfoW( GEOID id, GEOTYPE type, WCHAR *data, i
     const WCHAR *str = bufferW;
     int len;

-    TRACE( "%d %d %p %d %d\n", id, type, data, count, lang );
+    TRACE( "%ld %ld %p %d %d\n", id, type, data, count, lang );

if (!ptr)
     {
@@ -4332,11 +4332,11 @@ INT WINAPI DECLSPEC_HOTPATCH GetGeoInfoW( GEOID id, GEOTYPE type, WCHAR *data, i
     case GEO_CURRENCYCODE:
     case GEO_CURRENCYSYMBOL:
     case GEO_NAME:
-        FIXME( "type %d is not supported\n", type );
+        FIXME( "type %ld is not supported\n", type );
         SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
         return 0;
     default:
-        WARN( "unrecognized type %d\n", type );
+        WARN( "unrecognized type %ld\n", type );
         SetLastError( ERROR_INVALID_FLAGS );
         return 0;
     }
@@ -4358,7 +4358,7 @@ INT WINAPI DECLSPEC_HOTPATCH GetLocaleInfoA( LCID lcid, LCTYPE lctype, char *buf
     WCHAR *bufferW;
     INT lenW, ret;

-    TRACE( "lcid=0x%x lctype=0x%x %p %d\n", lcid, lctype, buffer, len );
+    TRACE( "lcid=0x%lx lctype=0x%lx %p %d\n", lcid, lctype, buffer, len );

if (len < 0 || (len && !buffer))
     {
@@ -4417,7 +4417,7 @@ INT WINAPI DECLSPEC_HOTPATCH GetLocaleInfoW( LCID lcid, LCTYPE lctype, WCHAR *bu
     lcid = ConvertDefaultLocale( lcid );
     lctype = LOWORD(lctype);

-    TRACE( "(lcid=0x%x,lctype=0x%x,%p,%d)\n", lcid, lctype, buffer, len );
+    TRACE( "(lcid=0x%lx,lctype=0x%lx,%p,%d)\n", lcid, lctype, buffer, len );

/* first check for overrides in the registry */

@@ -4510,7 +4510,7 @@ INT WINAPI DECLSPEC_HOTPATCH GetLocaleInfoW( LCID lcid, LCTYPE lctype, WCHAR *bu
         }
         HeapFree( GetProcessHeap(), 0, tmp );

-        TRACE( "(lcid=0x%x,lctype=0x%x,%p,%d) returning number %d\n",
+        TRACE( "(lcid=0x%lx,lctype=0x%lx,%p,%d) returning number %d\n",
                lcid, lctype, buffer, len, number );
     }
     else
@@ -4518,7 +4518,7 @@ INT WINAPI DECLSPEC_HOTPATCH GetLocaleInfoW( LCID lcid, LCTYPE lctype, WCHAR *bu
         memcpy( buffer, p + 1, ret * sizeof(WCHAR) );
         if (lctype != LOCALE_FONTSIGNATURE) buffer[ret-1] = 0;

-        TRACE( "(lcid=0x%x,lctype=0x%x,%p,%d) returning %d %s\n",
+        TRACE( "(lcid=0x%lx,lctype=0x%lx,%p,%d) returning %d %s\n",
                lcid, lctype, buffer, len, ret, debugstr_w(buffer) );
     }
     return ret;
@@ -4532,7 +4532,7 @@ INT WINAPI DECLSPEC_HOTPATCH GetLocaleInfoEx( const WCHAR *locale, LCTYPE info,
 {
     LCID lcid = LocaleNameToLCID( locale, 0 );

-    TRACE( "%s lcid=0x%x 0x%x\n", debugstr_w(locale), lcid, info );
+    TRACE( "%s lcid=0x%lx 0x%lx\n", debugstr_w(locale), lcid, info );

if (!lcid) return 0;

@@ -4904,7 +4904,7 @@ GEOID WINAPI DECLSPEC_HOTPATCH GetUserGeoID( GEOCLASS geoclass )
         name = L"Region";
         break;
     default:
-        WARN("Unknown geoclass %d\n", geoclass);
+        WARN("Unknown geoclass %ld\n", geoclass);
         return GEOID_NOT_AVAILABLE;
     }
     if (!RegOpenKeyExW( intl_key, L"Geo", 0, KEY_ALL_ACCESS, &hkey ))
@@ -5237,7 +5237,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH IsValidNLSVersion( NLS_FUNCTION func, const WCHAR
 INT WINAPI DECLSPEC_HOTPATCH LCIDToLocaleName( LCID lcid, WCHAR *name, INT count, DWORD flags )
 {
     static int once;
-    if (flags && !once++) FIXME( "unsupported flags %x\n", flags );
+    if (flags && !once++) FIXME( "unsupported flags %lx\n", flags );

return GetLocaleInfoW( lcid, LOCALE_SNAME | LOCALE_NOUSEROVERRIDE, name, count );
 }
@@ -5259,7 +5259,7 @@ INT WINAPI DECLSPEC_HOTPATCH LCMapStringEx( const WCHAR *locale, DWORD flags, co
     if (handle)
     {
         static int once;
-        if (!once++) FIXME( "unsupported lparam %lx\n", handle );
+        if (!once++) FIXME( "unsupported lparam %Ix\n", handle );
     }

if (!src || !srclen || dstlen < 0)
@@ -5299,7 +5299,7 @@ INT WINAPI DECLSPEC_HOTPATCH LCMapStringEx( const WCHAR *locale, DWORD flags, co
         }
         if (srclen < 0) srclen = lstrlenW(src);

-        TRACE( "(%s,0x%08x,%s,%d,%p,%d)\n",
+        TRACE( "(%s,0x%08lx,%s,%d,%p,%d)\n",
                debugstr_w(locale), flags, debugstr_wn(src, srclen), srclen, dst, dstlen );

if ((ret = get_sortkey( flags, src, srclen, (char *)dst, dstlen ))) ret++;
@@ -5324,7 +5324,7 @@ INT WINAPI DECLSPEC_HOTPATCH LCMapStringEx( const WCHAR *locale, DWORD flags, co

if (srclen < 0) srclen = lstrlenW(src) + 1;

-    TRACE( "(%s,0x%08x,%s,%d,%p,%d)\n",
+    TRACE( "(%s,0x%08lx,%s,%d,%p,%d)\n",
            debugstr_w(locale), flags, debugstr_wn(src, srclen), srclen, dst, dstlen );

if (!dst) /* return required string length */
@@ -5650,7 +5650,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetLocaleInfoW( LCID lcid, LCTYPE lctype, const WC
         return FALSE;
     }

-    TRACE( "setting %x (%s) to %s\n", lctype, debugstr_w(value->name), debugstr_w(data) );
+    TRACE( "setting %lx (%s) to %s\n", lctype, debugstr_w(value->name), debugstr_w(data) );

/* FIXME: should check that data to set is sane */

@@ -5696,7 +5696,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetLocaleInfoW( LCID lcid, LCTYPE lctype, const WC
  */
 INT WINAPI /* DECLSPEC_HOTPATCH */ SetCalendarInfoW( LCID lcid, CALID calendar, CALTYPE type, const WCHAR *data )
 {
-    FIXME( "(%08x,%08x,%08x,%s): stub\n", lcid, calendar, type, debugstr_w(data) );
+    FIXME( "(%08lx,%08lx,%08lx,%s): stub\n", lcid, calendar, type, debugstr_w(data) );
     return 0;
 }

diff --git a/dlls/kernelbase/main.c b/dlls/kernelbase/main.c
index 775c1c2ac07..b1b28d67abb 100644
--- a/dlls/kernelbase/main.c
+++ b/dlls/kernelbase/main.c
@@ -195,7 +195,7 @@ PERF_COUNTERSET_INSTANCE WINAPI *PerfCreateInstance( HANDLE handle, const GUID *
     unsigned int i;
     ULONG size;

-    FIXME( "handle %p, guid %s, name %s, id %u semi-stub.\n", handle, debugstr_guid(guid), debugstr_w(name), id );
+    FIXME( "handle %p, guid %s, name %s, id %lu semi-stub.\n", handle, debugstr_guid(guid), debugstr_w(name), id );

if (!prov || !guid || !name)
     {
@@ -274,7 +274,7 @@ ULONG WINAPI PerfSetCounterSetInfo( HANDLE handle, PERF_COUNTERSET_INFO *templat
     struct counterset_template *new;
     unsigned int i;

-    FIXME( "handle %p, template %p, size %u semi-stub.\n", handle, template, size );
+    FIXME( "handle %p, template %p, size %lu semi-stub.\n", handle, template, size );

if (!prov || !template) return ERROR_INVALID_PARAMETER;
     if (!template->NumCounters) return ERROR_INVALID_PARAMETER;
@@ -320,7 +320,7 @@ ULONG WINAPI PerfSetCounterRefValue(HANDLE provider, PERF_COUNTERSET_INSTANCE *i
     struct counterset_instance *inst;
     unsigned int i;

-    FIXME( "provider %p, instance %p, counterid %u, address %p semi-stub.\n",
+    FIXME( "provider %p, instance %p, counterid %lu, address %p semi-stub.\n",
            provider, instance, counterid, address );

if (!prov || !instance || !address) return ERROR_INVALID_PARAMETER;
@@ -438,7 +438,7 @@ HRESULT WINAPI QISearch(void *base, const QITAB *table, REFIID riid, void **obj)

for (ptr = table; ptr->piid; ++ptr)
     {
-        TRACE("trying (offset %d) %s\n", ptr->dwOffset, debugstr_guid(ptr->piid));
+        TRACE("trying (offset %ld) %s\n", ptr->dwOffset, debugstr_guid(ptr->piid));
         if (IsEqualIID(riid, ptr->piid))
         {
             unk = (IUnknown *)((BYTE *)base + ptr->dwOffset);
@@ -469,7 +469,7 @@ HRESULT WINAPI GetAcceptLanguagesA(LPSTR langbuf, DWORD *buflen)
     WCHAR *langbufW;
     HRESULT hr;

-    TRACE("%p, %p, *%p: %d\n", langbuf, buflen, buflen, buflen ? *buflen : -1);
+    TRACE("%p, %p, *%p: %ld\n", langbuf, buflen, buflen, buflen ? *buflen : -1);

if (!langbuf || !buflen || !*buflen)
         return E_FAIL;
@@ -538,7 +538,7 @@ HRESULT WINAPI GetAcceptLanguagesW(WCHAR *langbuf, DWORD *buflen)
     LONG lres;
     DWORD len;

-    TRACE("%p, %p, *%p: %d\n", langbuf, buflen, buflen, buflen ? *buflen : -1);
+    TRACE("%p, %p, *%p: %ld\n", langbuf, buflen, buflen, buflen ? *buflen : -1);

if (!langbuf || !buflen || !*buflen)
         return E_FAIL;
diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c
index 7844b571e51..29e1999fe6b 100644
--- a/dlls/kernelbase/memory.c
+++ b/dlls/kernelbase/memory.c
@@ -260,7 +260,7 @@ UINT WINAPI DECLSPEC_HOTPATCH ResetWriteWatch( void *base, SIZE_T size )
  */
 BOOL WINAPI DECLSPEC_HOTPATCH SetSystemFileCacheSize( SIZE_T mincache, SIZE_T maxcache, DWORD flags )
 {
-    FIXME( "stub: %ld %ld %d\n", mincache, maxcache, flags );
+    FIXME( "stub: %Id %Id %ld\n", mincache, maxcache, flags );
     SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
     return FALSE;
 }
@@ -329,7 +329,7 @@ LPVOID WINAPI DECLSPEC_HOTPATCH VirtualAllocFromApp( void *addr, SIZE_T size,
 {
     LPVOID ret = addr;

-    TRACE_(virtual)( "addr %p, size %p, type %#x, protect %#x.\n", addr, (void *)size, type, protect );
+    TRACE_(virtual)( "addr %p, size %p, type %#lx, protect %#lx.\n", addr, (void *)size, type, protect );

if (protect == PAGE_EXECUTE || protect == PAGE_EXECUTE_READ || protect == PAGE_EXECUTE_READWRITE
             || protect == PAGE_EXECUTE_WRITECOPY)
@@ -349,7 +349,7 @@ LPVOID WINAPI DECLSPEC_HOTPATCH VirtualAllocFromApp( void *addr, SIZE_T size,
 BOOL WINAPI /* DECLSPEC_HOTPATCH */ PrefetchVirtualMemory( HANDLE process, ULONG_PTR count,
                                                            WIN32_MEMORY_RANGE_ENTRY *addresses, ULONG flags )
 {
-    FIXME( "process %p, count %p, addresses %p, flags %#x stub.\n", process, (void *)count, addresses, flags );
+    FIXME( "process %p, count %p, addresses %p, flags %#lx stub.\n", process, (void *)count, addresses, flags );
     return TRUE;
 }

@@ -1079,7 +1079,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GlobalMemoryStatusEx( MEMORYSTATUSEX *status )
     if (status->ullTotalPhys)
         status->dwMemoryLoad = (status->ullTotalPhys - status->ullAvailPhys) / (status->ullTotalPhys / 100);

-    TRACE_(virtual)( "MemoryLoad %d, TotalPhys %s, AvailPhys %s, TotalPageFile %s,"
+    TRACE_(virtual)( "MemoryLoad %ld, TotalPhys %s, AvailPhys %s, TotalPageFile %s,"
                      "AvailPageFile %s, TotalVirtual %s, AvailVirtual %s\n",
                     status->dwMemoryLoad, wine_dbgstr_longlong(status->ullTotalPhys),
                     wine_dbgstr_longlong(status->ullAvailPhys), wine_dbgstr_longlong(status->ullTotalPageFile),
@@ -1096,7 +1096,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GlobalMemoryStatusEx( MEMORYSTATUSEX *status )
  */
 BOOL WINAPI DECLSPEC_HOTPATCH MapUserPhysicalPages( void *addr, ULONG_PTR page_count, ULONG_PTR *pages )
 {
-    FIXME( "stub: %p %lu %p\n", addr, page_count, pages );
+    FIXME( "stub: %p %Iu %p\n", addr, page_count, pages );
     *pages = 0;
     SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
     return FALSE;
@@ -1114,7 +1114,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH MapUserPhysicalPages( void *addr, ULONG_PTR page_c
 BOOL WINAPI DECLSPEC_HOTPATCH AllocateUserPhysicalPagesNuma( HANDLE process, ULONG_PTR *pages,
                                                              ULONG_PTR *userarray, DWORD node )
 {
-    if (node) FIXME( "Ignoring preferred node %u\n", node );
+    if (node) FIXME( "Ignoring preferred node %lu\n", node );
     return AllocateUserPhysicalPages( process, pages, userarray );
 }

@@ -1126,7 +1126,7 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateFileMappingNumaW( HANDLE file, LPSECURITY_
                                                         DWORD protect, DWORD size_high, DWORD size_low,
                                                         LPCWSTR name, DWORD node )
 {
-    if (node) FIXME( "Ignoring preferred node %u\n", node );
+    if (node) FIXME( "Ignoring preferred node %lu\n", node );
     return CreateFileMappingW( file, sa, protect, size_high, size_low, name );
 }

@@ -1177,7 +1177,7 @@ BOOL WINAPI GetSystemCpuSetInformation(SYSTEM_CPU_SET_INFORMATION *info, ULONG b
                                             HANDLE process, ULONG flags)
 {
     if (flags)
-        FIXME("Unsupported flags %#x.\n", flags);
+        FIXME("Unsupported flags %#lx.\n", flags);

*return_length = 0;

@@ -1191,7 +1191,7 @@ BOOL WINAPI GetSystemCpuSetInformation(SYSTEM_CPU_SET_INFORMATION *info, ULONG b
  */
 BOOL WINAPI SetThreadSelectedCpuSets(HANDLE thread, const ULONG *cpu_set_ids, ULONG count)
 {
-    FIXME( "thread %p, cpu_set_ids %p, count %u stub.\n", thread, cpu_set_ids, count );
+    FIXME( "thread %p, cpu_set_ids %p, count %lu stub.\n", thread, cpu_set_ids, count );

return TRUE;
 }
@@ -1236,7 +1236,7 @@ LPVOID WINAPI DECLSPEC_HOTPATCH MapViewOfFileExNuma( HANDLE handle, DWORD access
                                                      DWORD offset_low, SIZE_T count, LPVOID addr,
                                                      DWORD node )
 {
-    if (node) FIXME( "Ignoring preferred node %u\n", node );
+    if (node) FIXME( "Ignoring preferred node %lu\n", node );
     return MapViewOfFileEx( handle, access, offset_high, offset_low, count, addr );
 }

@@ -1247,7 +1247,7 @@ LPVOID WINAPI DECLSPEC_HOTPATCH MapViewOfFileExNuma( HANDLE handle, DWORD access
 LPVOID WINAPI DECLSPEC_HOTPATCH VirtualAllocExNuma( HANDLE process, void *addr, SIZE_T size,
                                                     DWORD type, DWORD protect, DWORD node )
 {
-    if (node) FIXME( "Ignoring preferred node %u\n", node );
+    if (node) FIXME( "Ignoring preferred node %lu\n", node );
     return VirtualAllocEx( process, addr, size, type, protect );
 }

@@ -1277,7 +1277,7 @@ BOOL WINAPI InitializeContext2( void *buffer, DWORD context_flags, CONTEXT **con
     ULONG orig_length;
     NTSTATUS status;

-    TRACE( "buffer %p, context_flags %#x, context %p, ret_length %p, compaction_mask %s.\n",
+    TRACE( "buffer %p, context_flags %#lx, context %p, ret_length %p, compaction_mask %s.\n",
             buffer, context_flags, context, length, wine_dbgstr_longlong(compaction_mask) );

orig_length = *length;
@@ -1460,7 +1460,7 @@ BOOL WINAPI GetXStateFeaturesMask( CONTEXT *context, DWORD64 *feature_mask )
  */
 UINT WINAPI EnumSystemFirmwareTables( DWORD provider, void *buffer, DWORD size )
 {
-    FIXME( "(0x%08x, %p, %d)\n", provider, buffer, size );
+    FIXME( "(0x%08lx, %p, %ld)\n", provider, buffer, size );
     return 0;
 }

@@ -1473,7 +1473,7 @@ UINT WINAPI GetSystemFirmwareTable( DWORD provider, DWORD id, void *buffer, DWOR
     SYSTEM_FIRMWARE_TABLE_INFORMATION *info;
     ULONG buffer_size = offsetof( SYSTEM_FIRMWARE_TABLE_INFORMATION, TableBuffer ) + size;

-    TRACE( "(0x%08x, 0x%08x, %p, %d)\n", provider, id, buffer, size );
+    TRACE( "(0x%08lx, 0x%08lx, %p, %ld)\n", provider, id, buffer, size );

if (!(info = RtlAllocateHeap( GetProcessHeap(), 0, buffer_size )))
     {
diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c
index 5f983895576..7cfff358fdb 100644
--- a/dlls/kernelbase/path.c
+++ b/dlls/kernelbase/path.c
@@ -200,7 +200,7 @@ HRESULT WINAPI PathAllocCanonicalize(const WCHAR *path_in, DWORD flags, WCHAR **
     const WCHAR *root_end;
     SIZE_T buffer_size, length;

-    TRACE("%s %#x %p\n", debugstr_w(path_in), flags, path_out);
+    TRACE("%s %#lx %p\n", debugstr_w(path_in), flags, path_out);

if (!path_in || !path_out
         || ((flags & PATHCCH_FORCE_ENABLE_LONG_NAME_PROCESS) && (flags & PATHCCH_FORCE_DISABLE_LONG_NAME_PROCESS))
@@ -387,7 +387,7 @@ HRESULT WINAPI PathAllocCombine(const WCHAR *path1, const WCHAR *path2, DWORD fl
     BOOL add_backslash = FALSE;
     HRESULT hr;

-    TRACE("%s %s %#x %p\n", wine_dbgstr_w(path1), wine_dbgstr_w(path2), flags, out);
+    TRACE("%s %s %#lx %p\n", wine_dbgstr_w(path1), wine_dbgstr_w(path2), flags, out);

if ((!path1 && !path2) || !out)
     {
@@ -448,7 +448,7 @@ HRESULT WINAPI PathCchAddBackslashEx(WCHAR *path, SIZE_T size, WCHAR **endptr, S
     BOOL needs_termination;
     SIZE_T length;

-    TRACE("%s, %lu, %p, %p\n", debugstr_w(path), size, endptr, remaining);
+    TRACE("%s, %Iu, %p, %p\n", debugstr_w(path), size, endptr, remaining);

length = lstrlenW(path);
     needs_termination = size && length && path[length - 1] != '\';
@@ -483,7 +483,7 @@ HRESULT WINAPI PathCchAddExtension(WCHAR *path, SIZE_T size, const WCHAR *extens
     BOOL has_dot;
     HRESULT hr;

-    TRACE("%s %lu %s\n", wine_dbgstr_w(path), size, wine_dbgstr_w(extension));
+    TRACE("%s %Iu %s\n", wine_dbgstr_w(path), size, wine_dbgstr_w(extension));

if (!path || !size || size > PATHCCH_MAX_CCH || !extension) return E_INVALIDARG;

@@ -521,7 +521,7 @@ HRESULT WINAPI PathCchAddExtension(WCHAR *path, SIZE_T size, const WCHAR *extens

HRESULT WINAPI PathCchAppend(WCHAR *path1, SIZE_T size, const WCHAR *path2)
 {
-    TRACE("%s %lu %s\n", wine_dbgstr_w(path1), size, wine_dbgstr_w(path2));
+    TRACE("%s %Iu %s\n", wine_dbgstr_w(path1), size, wine_dbgstr_w(path2));

return PathCchAppendEx(path1, size, path2, PATHCCH_NONE);
 }
@@ -531,7 +531,7 @@ HRESULT WINAPI PathCchAppendEx(WCHAR *path1, SIZE_T size, const WCHAR *path2, DW
     HRESULT hr;
     WCHAR *result;

-    TRACE("%s %lu %s %#x\n", wine_dbgstr_w(path1), size, wine_dbgstr_w(path2), flags);
+    TRACE("%s %Iu %s %#lx\n", wine_dbgstr_w(path1), size, wine_dbgstr_w(path2), flags);

if (!path1 || !size) return E_INVALIDARG;

@@ -553,7 +553,7 @@ HRESULT WINAPI PathCchAppendEx(WCHAR *path1, SIZE_T size, const WCHAR *path2, DW

HRESULT WINAPI PathCchCanonicalize(WCHAR *out, SIZE_T size, const WCHAR *in)
 {
-    TRACE("%p %lu %s\n", out, size, wine_dbgstr_w(in));
+    TRACE("%p %Iu %s\n", out, size, wine_dbgstr_w(in));

/* Not X:\ and path > MAX_PATH - 4, return HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE) */
     if (lstrlenW(in) > MAX_PATH - 4 && !(is_drive_spec( in ) && in[2] == '\'))
@@ -568,7 +568,7 @@ HRESULT WINAPI PathCchCanonicalizeEx(WCHAR *out, SIZE_T size, const WCHAR *in, D
     SIZE_T length;
     HRESULT hr;

-    TRACE("%p %lu %s %#x\n", out, size, wine_dbgstr_w(in), flags);
+    TRACE("%p %Iu %s %#lx\n", out, size, wine_dbgstr_w(in), flags);

if (!size) return E_INVALIDARG;

@@ -614,7 +614,7 @@ HRESULT WINAPI PathCchCombineEx(WCHAR *out, SIZE_T size, const WCHAR *path1, con
     WCHAR *buffer;
     SIZE_T length;

-    TRACE("%p %s %s %#x\n", out, wine_dbgstr_w(path1), wine_dbgstr_w(path2), flags);
+    TRACE("%p %s %s %#lx\n", out, wine_dbgstr_w(path1), wine_dbgstr_w(path2), flags);

if (!out || !size || size > PATHCCH_MAX_CCH) return E_INVALIDARG;

@@ -645,7 +645,7 @@ HRESULT WINAPI PathCchFindExtension(const WCHAR *path, SIZE_T size, const WCHAR
     const WCHAR *lastpoint = NULL;
     SIZE_T counter = 0;

-    TRACE("%s %lu %p\n", wine_dbgstr_w(path), size, extension);
+    TRACE("%s %Iu %p\n", wine_dbgstr_w(path), size, extension);

if (!path || !size || size > PATHCCH_MAX_CCH)
     {
@@ -716,7 +716,7 @@ HRESULT WINAPI PathCchRemoveBackslash(WCHAR *path, SIZE_T path_size)
     WCHAR *path_end;
     SIZE_T free_size;

-    TRACE("%s %lu\n", debugstr_w(path), path_size);
+    TRACE("%s %Iu\n", debugstr_w(path), path_size);

return PathCchRemoveBackslashEx(path, path_size, &path_end, &free_size);
 }
@@ -726,7 +726,7 @@ HRESULT WINAPI PathCchRemoveBackslashEx(WCHAR *path, SIZE_T path_size, WCHAR **p
     const WCHAR *root_end;
     SIZE_T path_length;

-    TRACE("%s %lu %p %p\n", debugstr_w(path), path_size, path_end, free_size);
+    TRACE("%s %Iu %p %p\n", debugstr_w(path), path_size, path_end, free_size);

if (!path_size || !path_end || !free_size)
     {
@@ -766,7 +766,7 @@ HRESULT WINAPI PathCchRemoveExtension(WCHAR *path, SIZE_T size)
     WCHAR *next;
     HRESULT hr;

-    TRACE("%s %lu\n", wine_dbgstr_w(path), size);
+    TRACE("%s %Iu\n", wine_dbgstr_w(path), size);

if (!path || !size || size > PATHCCH_MAX_CCH) return E_INVALIDARG;

@@ -785,7 +785,7 @@ HRESULT WINAPI PathCchRemoveFileSpec(WCHAR *path, SIZE_T size)
     SIZE_T length;
     WCHAR *last;

-    TRACE("%s %lu\n", wine_dbgstr_w(path), size);
+    TRACE("%s %Iu\n", wine_dbgstr_w(path), size);

if (!path || !size || size > PATHCCH_MAX_CCH) return E_INVALIDARG;

@@ -820,7 +820,7 @@ HRESULT WINAPI PathCchRenameExtension(WCHAR *path, SIZE_T size, const WCHAR *ext
 {
     HRESULT hr;

-    TRACE("%s %lu %s\n", wine_dbgstr_w(path), size, wine_dbgstr_w(extension));
+    TRACE("%s %Iu %s\n", wine_dbgstr_w(path), size, wine_dbgstr_w(extension));

hr = PathCchRemoveExtension(path, size);
     if (FAILED(hr)) return hr;
@@ -861,7 +861,7 @@ HRESULT WINAPI PathCchSkipRoot(const WCHAR *path, const WCHAR **root_end)

HRESULT WINAPI PathCchStripPrefix(WCHAR *path, SIZE_T size)
 {
-    TRACE("%s %lu\n", wine_dbgstr_w(path), size);
+    TRACE("%s %Iu\n", wine_dbgstr_w(path), size);

if (!path || !size || size > PATHCCH_MAX_CCH) return E_INVALIDARG;

@@ -889,7 +889,7 @@ HRESULT WINAPI PathCchStripToRoot(WCHAR *path, SIZE_T size)
     WCHAR *segment_end;
     BOOL is_unc;

-    TRACE("%s %lu\n", wine_dbgstr_w(path), size);
+    TRACE("%s %Iu\n", wine_dbgstr_w(path), size);

if (!path || !*path || !size || size > PATHCCH_MAX_CCH) return E_INVALIDARG;

@@ -2361,7 +2361,7 @@ BOOL WINAPI PathRelativePathToA(char *path, const char *from, DWORD attributes_f
     WCHAR pathW[MAX_PATH], fromW[MAX_PATH], toW[MAX_PATH];
     BOOL ret;

-    TRACE("%p, %s, %#x, %s, %#x\n", path, wine_dbgstr_a(from), attributes_from, wine_dbgstr_a(to), attributes_to);
+    TRACE("%p, %s, %#lx, %s, %#lx\n", path, wine_dbgstr_a(from), attributes_from, wine_dbgstr_a(to), attributes_to);

if (!path || !from || !to)
         return FALSE;
@@ -2380,7 +2380,7 @@ BOOL WINAPI PathRelativePathToW(WCHAR *path, const WCHAR *from, DWORD attributes
     WCHAR fromW[MAX_PATH], toW[MAX_PATH];
     DWORD len;

-    TRACE("%p, %s, %#x, %s, %#x\n", path, wine_dbgstr_w(from), attributes_from, wine_dbgstr_w(to), attributes_to);
+    TRACE("%p, %s, %#lx, %s, %#lx\n", path, wine_dbgstr_w(from), attributes_from, wine_dbgstr_w(to), attributes_to);

if (!path || !from || !to)
         return FALSE;
@@ -2841,7 +2841,7 @@ HRESULT WINAPI UrlUnescapeA(char *url, char *unescaped, DWORD *unescaped_len, DW
     DWORD needed;
     HRESULT hr;

-    TRACE("%s, %p, %p, %#x\n", wine_dbgstr_a(url), unescaped, unescaped_len, flags);
+    TRACE("%s, %p, %p, %#lx\n", wine_dbgstr_a(url), unescaped, unescaped_len, flags);

if (!url)
         return E_INVALIDARG;
@@ -2906,7 +2906,7 @@ HRESULT WINAPI UrlUnescapeW(WCHAR *url, WCHAR *unescaped, DWORD *unescaped_len,
     DWORD needed;
     HRESULT hr;

-    TRACE("%s, %p, %p, %#x\n", wine_dbgstr_w(url), unescaped, unescaped_len, flags);
+    TRACE("%s, %p, %p, %#lx\n", wine_dbgstr_w(url), unescaped, unescaped_len, flags);

if (!url)
         return E_INVALIDARG;
@@ -3003,7 +3003,7 @@ HRESULT WINAPI PathCreateFromUrlW(const WCHAR *url, WCHAR *path, DWORD *pcchPath
     WCHAR *tpath, *dst;
     HRESULT hr = S_OK;

-    TRACE("%s, %p, %p, %#x\n", wine_dbgstr_w(url), path, pcchPath, dwReserved);
+    TRACE("%s, %p, %p, %#lx\n", wine_dbgstr_w(url), path, pcchPath, dwReserved);

if (!url || !path || !pcchPath || !*pcchPath)
         return E_INVALIDARG;
@@ -3124,7 +3124,7 @@ HRESULT WINAPI PathCreateFromUrlW(const WCHAR *url, WCHAR *path, DWORD *pcchPath
     if (tpath != path)
         heap_free(tpath);

-    TRACE("Returning (%u) %s\n", *pcchPath, wine_dbgstr_w(path));
+    TRACE("Returning (%lu) %s\n", *pcchPath, wine_dbgstr_w(path));
     return hr;
 }

@@ -3285,7 +3285,7 @@ HRESULT WINAPI UrlEscapeW(const WCHAR *url, WCHAR *escaped, DWORD *escaped_len,
     INT i, len;
     HRESULT hr;

-    TRACE("%p, %s, %p, %p, %#x\n", url, wine_dbgstr_w(url), escaped, escaped_len, flags);
+    TRACE("%p, %s, %p, %p, %#lx\n", url, wine_dbgstr_w(url), escaped, escaped_len, flags);

if (!url || !escaped_len || !escaped || *escaped_len == 0)
         return E_INVALIDARG;
@@ -3293,7 +3293,7 @@ HRESULT WINAPI UrlEscapeW(const WCHAR *url, WCHAR *escaped, DWORD *escaped_len,
     if (flags & ~(URL_ESCAPE_SPACES_ONLY | URL_ESCAPE_SEGMENT_ONLY | URL_DONT_ESCAPE_EXTRA_INFO |
             URL_ESCAPE_PERCENT | URL_ESCAPE_AS_UTF8))
     {
-        FIXME("Unimplemented flags: %08x\n", flags);
+        FIXME("Unimplemented flags: %08lx\n", flags);
     }

dst_ptr = dst = heap_alloc(*escaped_len * sizeof(WCHAR));
@@ -3470,7 +3470,7 @@ HRESULT WINAPI UrlCanonicalizeA(const char *src_url, char *canonicalized, DWORD
     LPWSTR url, canonical;
     HRESULT hr;

-    TRACE("%s, %p, %p, %#x\n", wine_dbgstr_a(src_url), canonicalized, canonicalized_len, flags);
+    TRACE("%s, %p, %p, %#lx\n", wine_dbgstr_a(src_url), canonicalized, canonicalized_len, flags);

if (!src_url || !canonicalized || !canonicalized_len || !*canonicalized_len)
         return E_INVALIDARG;
@@ -3504,7 +3504,7 @@ HRESULT WINAPI UrlCanonicalizeW(const WCHAR *src_url, WCHAR *canonicalized, DWOR
     BOOL is_file_url;
     INT state;

-    TRACE("%s, %p, %p, %#x\n", wine_dbgstr_w(src_url), canonicalized, canonicalized_len, flags);
+    TRACE("%s, %p, %p, %#lx\n", wine_dbgstr_w(src_url), canonicalized, canonicalized_len, flags);

if (!src_url || !canonicalized || !canonicalized_len || !*canonicalized_len)
         return E_INVALIDARG;
@@ -3848,7 +3848,7 @@ HRESULT WINAPI UrlApplySchemeA(const char *url, char *out, DWORD *out_len, DWORD
     HRESULT hr;
     DWORD len;

-    TRACE("%s, %p, %p:out size %d, %#x\n", wine_dbgstr_a(url), out, out_len, out_len ? *out_len : 0, flags);
+    TRACE("%s, %p, %p:out size %ld, %#lx\n", wine_dbgstr_a(url), out, out_len, out_len ? *out_len : 0, flags);

if (!url || !out || !out_len)
         return E_INVALIDARG;
@@ -3995,7 +3995,7 @@ HRESULT WINAPI UrlApplySchemeW(const WCHAR *url, WCHAR *out, DWORD *length, DWOR
     DWORD res1;
     HRESULT hr;

-    TRACE("%s, %p, %p:out size %d, %#x\n", wine_dbgstr_w(url), out, length, length ? *length : 0, flags);
+    TRACE("%s, %p, %p:out size %ld, %#lx\n", wine_dbgstr_w(url), out, length, length ? *length : 0, flags);

if (!url || !out || !length)
         return E_INVALIDARG;
@@ -4083,7 +4083,7 @@ HRESULT WINAPI UrlFixupW(const WCHAR *url, WCHAR *translatedUrl, DWORD maxChars)
 {
     DWORD srcLen;

-    FIXME("%s, %p, %d stub\n", wine_dbgstr_w(url), translatedUrl, maxChars);
+    FIXME("%s, %p, %ld stub\n", wine_dbgstr_w(url), translatedUrl, maxChars);

if (!url)
         return E_FAIL;
@@ -4298,7 +4298,7 @@ static LONG parse_url(const WCHAR *url, struct parsed_url *pl)
         if (pl->query) pl->query_len = lstrlenW(pl->query);
     }
   SuccessExit:
-    TRACE("parse successful: scheme=%p(%d), user=%p(%d), pass=%p(%d), host=%p(%d), port=%p(%d), query=%p(%d)\n",
+    TRACE("parse successful: scheme=%p(%ld), user=%p(%ld), pass=%p(%ld), host=%p(%ld), port=%p(%ld), query=%p(%ld)\n",
             pl->scheme, pl->scheme_len, pl->username, pl->username_len, pl->password, pl->password_len, pl->hostname,
             pl->hostname_len, pl->port, pl->port_len, pl->query, pl->query_len);

@@ -4316,7 +4316,7 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p
     struct parsed_url pl;
     HRESULT hr;

-    TRACE("%s, %p, %p(%d), %#x, %#x\n", wine_dbgstr_w(url), out, out_len, *out_len, part, flags);
+    TRACE("%s, %p, %p(%ld), %#lx, %#lx\n", wine_dbgstr_w(url), out, out_len, *out_len, part, flags);

if (!url || !out || !out_len || !*out_len)
         return E_INVALIDARG;
@@ -4449,7 +4449,7 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p
         out[size] = 0;
         *out_len = size;
     }
-    TRACE("len=%d %s\n", *out_len, wine_dbgstr_w(out));
+    TRACE("len=%ld %s\n", *out_len, wine_dbgstr_w(out));

return hr;
 }
@@ -4608,7 +4608,7 @@ HRESULT WINAPI UrlCreateFromPathW(const WCHAR *path, WCHAR *url, DWORD *url_len,
 {
     HRESULT hr;

-    TRACE("%s, %p, %p, %#x\n", debugstr_w(path), url, url_len, reserved);
+    TRACE("%s, %p, %p, %#lx\n", debugstr_w(path), url, url_len, reserved);

if (reserved || !url || !url_len)
         return E_INVALIDARG;
@@ -4626,7 +4626,7 @@ HRESULT WINAPI UrlCombineA(const char *base, const char *relative, char *combine
     DWORD len, len2;
     HRESULT hr;

-    TRACE("%s, %s, %d, %#x\n", debugstr_a(base), debugstr_a(relative), combined_len ? *combined_len : 0, flags);
+    TRACE("%s, %s, %ld, %#lx\n", debugstr_a(base), debugstr_a(relative), combined_len ? *combined_len : 0, flags);

if (!base || !relative || !combined_len)
         return E_INVALIDARG;
@@ -4667,7 +4667,7 @@ HRESULT WINAPI UrlCombineW(const WCHAR *baseW, const WCHAR *relativeW, WCHAR *co
     PARSEDURLW base, relative;
     HRESULT hr;

-    TRACE("%s, %s, %d, %#x\n", debugstr_w(baseW), debugstr_w(relativeW), combined_len ? *combined_len : 0, flags);
+    TRACE("%s, %s, %ld, %#lx\n", debugstr_w(baseW), debugstr_w(relativeW), combined_len ? *combined_len : 0, flags);

if (!baseW || !relativeW || !combined_len)
         return E_INVALIDARG;
@@ -4915,7 +4915,7 @@ HRESULT WINAPI UrlCombineW(const WCHAR *baseW, const WCHAR *relativeW, WCHAR *co
         break;

default:
-        FIXME("Unexpected case %d.\n", process_case);
+        FIXME("Unexpected case %ld.\n", process_case);
         hr = E_INVALIDARG;
     }

@@ -4928,7 +4928,7 @@ HRESULT WINAPI UrlCombineW(const WCHAR *baseW, const WCHAR *relativeW, WCHAR *co
         if (SUCCEEDED(hr) && combined)
             lstrcpyW(combined, mrelative);

-        TRACE("return-%d len=%d, %s\n", process_case, *combined_len, debugstr_w(combined));
+        TRACE("return-%ld len=%ld, %s\n", process_case, *combined_len, debugstr_w(combined));
     }

heap_free(preliminary);
@@ -4980,7 +4980,7 @@ HRESULT WINAPI UrlHashW(const WCHAR *url, unsigned char *dest, DWORD dest_len)
 {
     char urlA[MAX_PATH];

-    TRACE("%s, %p, %d\n", debugstr_w(url), dest, dest_len);
+    TRACE("%s, %p, %ld\n", debugstr_w(url), dest, dest_len);

__TRY
     {
diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c
index 12187b92e5c..35381f409e9 100644
--- a/dlls/kernelbase/process.c
+++ b/dlls/kernelbase/process.c
@@ -530,7 +530,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalW( HANDLE token, const WCHAR
     if (flags & (IDLE_PRIORITY_CLASS | HIGH_PRIORITY_CLASS | REALTIME_PRIORITY_CLASS |
                  CREATE_DEFAULT_ERROR_MODE | CREATE_NO_WINDOW |
                  PROFILE_USER | PROFILE_KERNEL | PROFILE_SERVER))
-        WARN( "(%s,...): ignoring some flags in %x\n", debugstr_w(app_name), flags );
+        WARN( "(%s,...): ignoring some flags in %lx\n", debugstr_w(app_name), flags );

if (cur_dir)
     {
@@ -646,7 +646,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalW( HANDLE token, const WCHAR
         info->dwProcessId = HandleToUlong( rtl_info.ClientId.UniqueProcess );
         info->dwThreadId  = HandleToUlong( rtl_info.ClientId.UniqueThread );
         if (!(flags & CREATE_SUSPENDED)) NtResumeThread( rtl_info.Thread, NULL );
-        TRACE( "started process pid %04x tid %04x\n", info->dwProcessId, info->dwThreadId );
+        TRACE( "started process pid %04lx tid %04lx\n", info->dwProcessId, info->dwThreadId );
     }

done:
@@ -855,7 +855,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetProcessId( HANDLE process )
 BOOL WINAPI /* DECLSPEC_HOTPATCH */ GetProcessMitigationPolicy( HANDLE process, PROCESS_MITIGATION_POLICY policy,
                                                           void *buffer, SIZE_T length )
 {
-    FIXME( "(%p, %u, %p, %lu): stub\n", process, policy, buffer, length );
+    FIXME( "(%p, %u, %p, %Iu): stub\n", process, policy, buffer, length );
     return TRUE;
 }

@@ -1128,7 +1128,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetPriorityClass( HANDLE process, DWORD class )
  */
 BOOL WINAPI DECLSPEC_HOTPATCH SetProcessAffinityUpdateMode( HANDLE process, DWORD flags )
 {
-    FIXME( "(%p,0x%08x): stub\n", process, flags );
+    FIXME( "(%p,0x%08lx): stub\n", process, flags );
     SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
     return FALSE;
 }
@@ -1152,7 +1152,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetProcessGroupAffinity( HANDLE process, const GRO
 BOOL WINAPI /* DECLSPEC_HOTPATCH */ SetProcessMitigationPolicy( PROCESS_MITIGATION_POLICY policy,
                                                           void *buffer, SIZE_T length )
 {
-    FIXME( "(%d, %p, %lu): stub\n", policy, buffer, length );
+    FIXME( "(%d, %p, %Iu): stub\n", policy, buffer, length );
     return TRUE;
 }

@@ -1172,7 +1172,7 @@ BOOL WINAPI /* DECLSPEC_HOTPATCH */ SetProcessPriorityBoost( HANDLE process, BOO
  */
 BOOL WINAPI DECLSPEC_HOTPATCH SetProcessShutdownParameters( DWORD level, DWORD flags )
 {
-    FIXME( "(%08x, %08x): partial stub.\n", level, flags );
+    FIXME( "(%08lx, %08lx): partial stub.\n", level, flags );
     shutdown_flags = flags;
     shutdown_priority = level;
     return TRUE;
@@ -1380,7 +1380,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH ExpandEnvironmentStringsW( LPCWSTR src, LPWSTR ds
     NTSTATUS status;
     DWORD res;

-    TRACE( "(%s %p %u)\n", debugstr_w(src), dst, len );
+    TRACE( "(%s %p %lu)\n", debugstr_w(src), dst, len );

RtlInitUnicodeString( &us_src, src );

@@ -1553,7 +1553,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetEnvironmentVariableW( LPCWSTR name, LPWSTR val
     NTSTATUS status;
     DWORD len;

-    TRACE( "(%s %p %u)\n", debugstr_w(name), val, size );
+    TRACE( "(%s %p %lu)\n", debugstr_w(name), val, size );

RtlInitUnicodeString( &us_name, name );
     us_value.Length = 0;
@@ -1648,7 +1648,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH InitializeProcThreadAttributeList( struct _PROC_TH
     SIZE_T needed;
     BOOL ret = FALSE;

-    TRACE( "(%p %d %x %p)\n", list, count, flags, size );
+    TRACE( "(%p %ld %lx %p)\n", list, count, flags, size );

needed = FIELD_OFFSET( struct _PROC_THREAD_ATTRIBUTE_LIST, attrs[count] );
     if (list && *size >= needed)
@@ -1676,7 +1676,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH UpdateProcThreadAttribute( struct _PROC_THREAD_ATT
     DWORD mask;
     struct proc_thread_attr *entry;

-    TRACE( "(%p %x %08lx %p %ld %p %p)\n", list, flags, attr, value, size, prev_ret, size_ret );
+    TRACE( "(%p %lx %08Ix %p %Id %p %p)\n", list, flags, attr, value, size, prev_ret, size_ret );

if (list->count >= list->size)
     {
@@ -1744,7 +1744,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH UpdateProcThreadAttribute( struct _PROC_THREAD_ATT

default:
         SetLastError( ERROR_NOT_SUPPORTED );
-        FIXME( "Unhandled attribute %lu\n", attr & PROC_THREAD_ATTRIBUTE_NUMBER );
+        FIXME( "Unhandled attribute %Iu\n", attr & PROC_THREAD_ATTRIBUTE_NUMBER );
         return FALSE;
     }

diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c
index 5f777e0f752..91462d80e06 100644
--- a/dlls/kernelbase/registry.c
+++ b/dlls/kernelbase/registry.c
@@ -690,7 +690,7 @@ LSTATUS WINAPI RegEnumKeyExW( HKEY hkey, DWORD index, LPWSTR name, LPDWORD name_
     KEY_NODE_INFORMATION *info = (KEY_NODE_INFORMATION *)buffer;
     DWORD total_size;

-    TRACE( "(%p,%d,%p,%p(%u),%p,%p,%p,%p)\n", hkey, index, name, name_len,
+    TRACE( "(%p,%ld,%p,%p(%lu),%p,%p,%p,%p)\n", hkey, index, name, name_len,
            name_len ? *name_len : 0, reserved, class, class_len, ft );

if (reserved) return ERROR_INVALID_PARAMETER;
@@ -754,7 +754,7 @@ LSTATUS WINAPI RegEnumKeyExA( HKEY hkey, DWORD index, LPSTR name, LPDWORD name_l
     KEY_NODE_INFORMATION *info = (KEY_NODE_INFORMATION *)buffer;
     DWORD total_size;

-    TRACE( "(%p,%d,%p,%p(%u),%p,%p,%p,%p)\n", hkey, index, name, name_len,
+    TRACE( "(%p,%ld,%p,%p(%lu),%p,%p,%p,%p)\n", hkey, index, name, name_len,
            name_len ? *name_len : 0, reserved, class, class_len, ft );

if (reserved) return ERROR_INVALID_PARAMETER;
@@ -848,7 +848,7 @@ LSTATUS WINAPI RegQueryInfoKeyW( HKEY hkey, LPWSTR class, LPDWORD class_len, LPD
     KEY_FULL_INFORMATION *info = (KEY_FULL_INFORMATION *)buffer;
     DWORD total_size;

-    TRACE( "(%p,%p,%d,%p,%p,%p,%p,%p,%p,%p,%p)\n", hkey, class, class_len ? *class_len : 0,
+    TRACE( "(%p,%p,%ld,%p,%p,%p,%p,%p,%p,%p,%p)\n", hkey, class, class_len ? *class_len : 0,
            reserved, subkeys, max_subkey, values, max_value, max_data, security, modif );

if (class && !class_len && is_version_nt()) return ERROR_INVALID_PARAMETER;
@@ -938,7 +938,7 @@ LSTATUS WINAPI RegQueryInfoKeyA( HKEY hkey, LPSTR class, LPDWORD class_len, LPDW
     KEY_FULL_INFORMATION *info = (KEY_FULL_INFORMATION *)buffer;
     DWORD total_size;

-    TRACE( "(%p,%p,%d,%p,%p,%p,%p,%p,%p,%p,%p)\n", hkey, class, class_len ? *class_len : 0,
+    TRACE( "(%p,%p,%ld,%p,%p,%p,%p,%p,%p,%p,%p)\n", hkey, class, class_len ? *class_len : 0,
            reserved, subkeys, max_subkey, values, max_value, max_data, security, modif );

if (class && !class_len && is_version_nt()) return ERROR_INVALID_PARAMETER;
@@ -1036,7 +1036,7 @@ LSTATUS WINAPI RegDeleteKeyExW( HKEY hkey, LPCWSTR name, REGSAM access, DWORD re
         ret = RtlNtStatusToDosError( NtDeleteKey( tmp ) );
         RegCloseKey( tmp );
     }
-    TRACE("%s ret=%08x\n", debugstr_w(name), ret);
+    TRACE("%s ret=%08lx\n", debugstr_w(name), ret);
     return ret;
 }

@@ -1069,7 +1069,7 @@ LSTATUS WINAPI RegDeleteKeyExA( HKEY hkey, LPCSTR name, REGSAM access, DWORD res
         ret = RtlNtStatusToDosError( NtDeleteKey( tmp ) );
         RegCloseKey( tmp );
     }
-    TRACE("%s ret=%08x\n", debugstr_a(name), ret);
+    TRACE("%s ret=%08lx\n", debugstr_a(name), ret);
     return ret;
 }

@@ -1175,7 +1175,7 @@ LONG WINAPI RegSetKeyValueW( HKEY hkey, LPCWSTR subkey, LPCWSTR name, DWORD type
     HKEY hsubkey = NULL;
     DWORD ret;

-    TRACE("(%p,%s,%s,%d,%p,%d)\n", hkey, debugstr_w(subkey), debugstr_w(name), type, data, len );
+    TRACE("(%p,%s,%s,%ld,%p,%ld)\n", hkey, debugstr_w(subkey), debugstr_w(name), type, data, len );

if (subkey && subkey[0])  /* need to create the subkey */
     {
@@ -1197,7 +1197,7 @@ LONG WINAPI RegSetKeyValueA( HKEY hkey, LPCSTR subkey, LPCSTR name, DWORD type,
     HKEY hsubkey = NULL;
     DWORD ret;

-    TRACE("(%p,%s,%s,%d,%p,%d)\n", hkey, debugstr_a(subkey), debugstr_a(name), type, data, len );
+    TRACE("(%p,%s,%s,%ld,%p,%ld)\n", hkey, debugstr_a(subkey), debugstr_a(name), type, data, len );

if (subkey && subkey[0])  /* need to create the subkey */
     {
@@ -1369,7 +1369,7 @@ static DWORD collect_data(struct perf_provider *provider, const WCHAR *query, vo
     err = provider->pOpen(linkage);
     if (err != ERROR_SUCCESS)
     {
-        TRACE("Open(%s) error %u (%#x)\n", debugstr_w(linkage), err, err);
+        TRACE("Open(%s) error %lu (%#lx)\n", debugstr_w(linkage), err, err);
         return err;
     }

@@ -1377,7 +1377,7 @@ static DWORD collect_data(struct perf_provider *provider, const WCHAR *query, vo
     err = provider->pCollect((WCHAR *)query, data, size, obj_count);
     if (err != ERROR_SUCCESS)
     {
-        TRACE("Collect error %u (%#x)\n", err, err);
+        TRACE("Collect error %lu (%#lx)\n", err, err);
         *obj_count = 0;
     }

@@ -1488,7 +1488,7 @@ static DWORD query_perf_data( const WCHAR *query, DWORD *type, void *data, DWORD
         {
             PERF_OBJECT_TYPE *obj = (PERF_OBJECT_TYPE *)data;

-            TRACE("Collect: obj->TotalByteLength %u, collected_size %u\n",
+            TRACE("Collect: obj->TotalByteLength %lu, collected_size %lu\n",
                 obj->TotalByteLength, collected_size);

data_size -= collected_size;
@@ -1527,7 +1527,7 @@ LSTATUS WINAPI DECLSPEC_HOTPATCH RegQueryValueExW( HKEY hkey, LPCWSTR name, LPDW
     KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer;
     static const int info_size = offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data );

-    TRACE("(%p,%s,%p,%p,%p,%p=%d)\n",
+    TRACE("(%p,%s,%p,%p,%p,%p=%ld)\n",
           hkey, debugstr_w(name), reserved, type, data, count,
           (count && data) ? *count : 0 );

@@ -1622,7 +1622,7 @@ LSTATUS WINAPI DECLSPEC_HOTPATCH RegQueryValueExA( HKEY hkey, LPCSTR name, LPDWO
     KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer;
     static const int info_size = offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data );

-    TRACE("(%p,%s,%p,%p,%p,%p=%d)\n",
+    TRACE("(%p,%s,%p,%p,%p,%p=%ld)\n",
           hkey, debugstr_a(name), reserved, type, data, count, count ? *count : 0 );

if ((data && !count) || reserved) return ERROR_INVALID_PARAMETER;
@@ -1789,7 +1789,7 @@ LSTATUS WINAPI RegGetValueW( HKEY hKey, LPCWSTR pszSubKey, LPCWSTR pszValue,
     PVOID pvBuf = NULL;
     LONG ret;

-    TRACE("(%p,%s,%s,%d,%p,%p,%p=%d)\n",
+    TRACE("(%p,%s,%s,%ld,%p,%p,%p=%ld)\n",
           hKey, debugstr_w(pszSubKey), debugstr_w(pszValue), dwFlags, pdwType,
           pvData, pcbData, cbData);

@@ -1894,7 +1894,7 @@ LSTATUS WINAPI RegGetValueA( HKEY hKey, LPCSTR pszSubKey, LPCSTR pszValue,
     PVOID pvBuf = NULL;
     LONG ret;

-    TRACE("(%p,%s,%s,%d,%p,%p,%p=%d)\n",
+    TRACE("(%p,%s,%s,%ld,%p,%p,%p=%ld)\n",
           hKey, debugstr_a(pszSubKey), debugstr_a(pszValue), dwFlags,
           pdwType, pvData, pcbData, cbData);

@@ -2014,7 +2014,7 @@ LSTATUS WINAPI RegEnumValueW( HKEY hkey, DWORD index, LPWSTR value, LPDWORD val_
     KEY_VALUE_FULL_INFORMATION *info = (KEY_VALUE_FULL_INFORMATION *)buffer;
     static const int info_size = offsetof( KEY_VALUE_FULL_INFORMATION, Name );

-    TRACE("(%p,%d,%p,%p,%p,%p,%p,%p)\n",
+    TRACE("(%p,%ld,%p,%p,%p,%p,%p,%p)\n",
           hkey, index, value, val_count, reserved, type, data, count );

if ((data && !count) || reserved || !value || !val_count)
@@ -2091,7 +2091,7 @@ LSTATUS WINAPI RegEnumValueA( HKEY hkey, DWORD index, LPSTR value, LPDWORD val_c
     KEY_VALUE_FULL_INFORMATION *info = (KEY_VALUE_FULL_INFORMATION *)buffer;
     static const int info_size = offsetof( KEY_VALUE_FULL_INFORMATION, Name );

-    TRACE("(%p,%d,%p,%p,%p,%p,%p,%p)\n",
+    TRACE("(%p,%ld,%p,%p,%p,%p,%p,%p)\n",
           hkey, index, value, val_count, reserved, type, data, count );

if ((data && !count) || reserved || !value || !val_count)
@@ -2399,13 +2399,13 @@ LSTATUS WINAPI RegSaveKeyExA( HKEY hkey, LPCSTR file, SECURITY_ATTRIBUTES *sa, D
  */
 LSTATUS WINAPI RegRestoreKeyW( HKEY hkey, LPCWSTR lpFile, DWORD dwFlags )
 {
-    TRACE("(%p,%s,%d)\n",hkey,debugstr_w(lpFile),dwFlags);
+    TRACE("(%p,%s,%ld)\n",hkey,debugstr_w(lpFile),dwFlags);

/* It seems to do this check before the hkey check */
     if (!lpFile || !*lpFile)
         return ERROR_INVALID_PARAMETER;

-    FIXME("(%p,%s,%d): stub\n",hkey,debugstr_w(lpFile),dwFlags);
+    FIXME("(%p,%s,%ld): stub\n",hkey,debugstr_w(lpFile),dwFlags);

/* Check for file existence */

@@ -2492,7 +2492,7 @@ LSTATUS WINAPI RegUnLoadKeyA( HKEY hkey, LPCSTR lpSubKey )
 LSTATUS WINAPI RegSetKeySecurity( HKEY hkey, SECURITY_INFORMATION SecurityInfo,
                                   PSECURITY_DESCRIPTOR pSecurityDesc )
 {
-    TRACE("(%p,%d,%p)\n",hkey,SecurityInfo,pSecurityDesc);
+    TRACE("(%p,%ld,%p)\n",hkey,SecurityInfo,pSecurityDesc);

/* It seems to perform this check before the hkey check */
     if ((SecurityInfo & OWNER_SECURITY_INFORMATION) ||
@@ -2531,7 +2531,7 @@ LSTATUS WINAPI RegGetKeySecurity( HKEY hkey, SECURITY_INFORMATION SecurityInform
                                   PSECURITY_DESCRIPTOR pSecurityDescriptor,
                                   LPDWORD lpcbSecurityDescriptor )
 {
-    TRACE("(%p,%d,%p,%d)\n",hkey,SecurityInformation,pSecurityDescriptor,
+    TRACE("(%p,%ld,%p,%ld)\n",hkey,SecurityInformation,pSecurityDescriptor,
           *lpcbSecurityDescriptor);

if (!(hkey = get_special_root_hkey( hkey, 0 ))) return ERROR_INVALID_HANDLE;
@@ -2589,7 +2589,7 @@ LSTATUS WINAPI RegNotifyChangeKeyValue( HKEY hkey, BOOL fWatchSubTree,
     hkey = get_special_root_hkey( hkey, 0 );
     if (!hkey) return ERROR_INVALID_HANDLE;

-    TRACE("(%p,%i,%d,%p,%i)\n", hkey, fWatchSubTree, fdwNotifyFilter,
+    TRACE("(%p,%i,%ld,%p,%i)\n", hkey, fWatchSubTree, fdwNotifyFilter,
           hEvent, fAsync);

status = NtNotifyChangeKey( hkey, hEvent, NULL, NULL, &iosb,
@@ -2624,7 +2624,7 @@ LSTATUS WINAPI RegNotifyChangeKeyValue( HKEY hkey, BOOL fWatchSubTree,
  */
 LSTATUS WINAPI RegOpenUserClassesRoot( HANDLE hToken, DWORD dwOptions, REGSAM samDesired, PHKEY phkResult )
 {
-    FIXME("(%p, 0x%x, 0x%x, %p) semi-stub\n", hToken, dwOptions, samDesired, phkResult);
+    FIXME("(%p, 0x%lx, 0x%lx, %p) semi-stub\n", hToken, dwOptions, samDesired, phkResult);

*phkResult = HKEY_CLASSES_ROOT;
     return ERROR_SUCCESS;
@@ -2637,7 +2637,7 @@ static void dump_mui_cache(void)

TRACE("---------- MUI Cache ----------\n");
     LIST_FOR_EACH_ENTRY( ent, &reg_mui_cache, struct mui_cache_entry, entry )
-        TRACE("entry=%p, %s,-%u [%#x] => %s\n",
+        TRACE("entry=%p, %s,-%lu [%#lx] => %s\n",
               ent, wine_dbgstr_w(ent->file_name), ent->index, ent->locale, wine_dbgstr_w(ent->text));
 }

@@ -2819,8 +2819,8 @@ LSTATUS WINAPI RegLoadMUIStringW(HKEY hKey, LPCWSTR pwszValue, LPWSTR pwszBuffer
     LPWSTR pwszTempBuffer = NULL, pwszExpandedBuffer = NULL;
     LONG result;

-    TRACE("(hKey = %p, pwszValue = %s, pwszBuffer = %p, cbBuffer = %d, pcbData = %p, "
-          "dwFlags = %d, pwszBaseDir = %s)\n", hKey, debugstr_w(pwszValue), pwszBuffer,
+    TRACE("(hKey = %p, pwszValue = %s, pwszBuffer = %p, cbBuffer = %ld, pcbData = %p, "
+          "dwFlags = %lu, pwszBaseDir = %s)\n", hKey, debugstr_w(pwszValue), pwszBuffer,
           cbBuffer, pcbData, dwFlags, debugstr_w(pwszBaseDir));

/* Parameter sanity checks. */
@@ -3087,7 +3087,7 @@ cleanup:
  */
 LSTATUS WINAPI RegLoadAppKeyA(const char *file, HKEY *result, REGSAM sam, DWORD options, DWORD reserved)
 {
-    FIXME("%s %p %u %u %u: stub\n", wine_dbgstr_a(file), result, sam, options, reserved);
+    FIXME("%s %p %lu %lu %lu: stub\n", wine_dbgstr_a(file), result, sam, options, reserved);

if (!file || reserved)
         return ERROR_INVALID_PARAMETER;
@@ -3102,7 +3102,7 @@ LSTATUS WINAPI RegLoadAppKeyA(const char *file, HKEY *result, REGSAM sam, DWORD
  */
 LSTATUS WINAPI RegLoadAppKeyW(const WCHAR *file, HKEY *result, REGSAM sam, DWORD options, DWORD reserved)
 {
-    FIXME("%s %p %u %u %u: stub\n", wine_dbgstr_w(file), result, sam, options, reserved);
+    FIXME("%s %p %lu %lu %lu: stub\n", wine_dbgstr_w(file), result, sam, options, reserved);

if (!file || reserved)
         return ERROR_INVALID_PARAMETER;
@@ -3244,7 +3244,7 @@ BOOL WINAPI GetComputerNameExW( COMPUTER_NAME_FORMAT type, WCHAR *name, DWORD *l
         *len = size / sizeof(WCHAR);
         RegCloseKey( key );
     }
-    TRACE("-> %lu %s\n", ret, debugstr_w(name) );
+    TRACE("-> %Iu %s\n", ret, debugstr_w(name) );
     if (ret) SetLastError( ret );
     return !ret;
 }
@@ -3372,7 +3372,7 @@ LONG WINAPI SHRegCreateUSKeyA(LPCSTR path, REGSAM samDesired, HUSKEY relative_ke
     WCHAR *pathW;
     LONG ret;

-    TRACE("%s, %#x, %p, %p, %#x\n", debugstr_a(path), samDesired, relative_key, new_uskey, flags);
+    TRACE("%s, %#lx, %p, %p, %#lx\n", debugstr_a(path), samDesired, relative_key, new_uskey, flags);

if (path)
     {
@@ -3426,7 +3426,7 @@ LONG WINAPI SHRegCreateUSKeyW(const WCHAR *path, REGSAM samDesired, HUSKEY relat
     LONG ret = ERROR_CALL_NOT_IMPLEMENTED;
     struct USKEY *ret_key;

-    TRACE("%s, %#x, %p, %p, %#x\n", debugstr_w(path), samDesired, relative_key, new_uskey, flags);
+    TRACE("%s, %#lx, %p, %p, %#lx\n", debugstr_w(path), samDesired, relative_key, new_uskey, flags);

if (!new_uskey)
         return ERROR_INVALID_PARAMETER;
@@ -3435,7 +3435,7 @@ LONG WINAPI SHRegCreateUSKeyW(const WCHAR *path, REGSAM samDesired, HUSKEY relat

if (flags & ~SHREGSET_FORCE_HKCU)
     {
-        FIXME("unsupported flags 0x%08x\n", flags);
+        FIXME("unsupported flags 0x%08lx\n", flags);
         return ERROR_SUCCESS;
     }

@@ -3515,7 +3515,7 @@ LONG WINAPI SHRegEnumUSValueA(HUSKEY hUSKey, DWORD index, char *value_name, DWOR
 {
     HKEY dokey;

-    TRACE("%p, %#x, %p, %p, %p, %p, %p, %#x\n", hUSKey, index, value_name, value_name_len, type, data, data_len, flags);
+    TRACE("%p, %#lx, %p, %p, %p, %p, %p, %#x\n", hUSKey, index, value_name, value_name_len, type, data, data_len, flags);

if ((flags == SHREGENUM_HKCU || flags == SHREGENUM_DEFAULT) && (dokey = reg_get_hkey_from_huskey(hUSKey, TRUE)))
         return RegEnumValueA(dokey, index, value_name, value_name_len, NULL, type, data, data_len);
@@ -3532,7 +3532,7 @@ LONG WINAPI SHRegEnumUSValueW(HUSKEY hUSKey, DWORD index, WCHAR *value_name, DWO
 {
     HKEY dokey;

-    TRACE("%p, %#x, %p, %p, %p, %p, %p, %#x\n", hUSKey, index, value_name, value_name_len, type, data, data_len, flags);
+    TRACE("%p, %#lx, %p, %p, %p, %p, %p, %#x\n", hUSKey, index, value_name, value_name_len, type, data, data_len, flags);

if ((flags == SHREGENUM_HKCU || flags == SHREGENUM_DEFAULT) && (dokey = reg_get_hkey_from_huskey(hUSKey, TRUE)))
         return RegEnumValueW(dokey, index, value_name, value_name_len, NULL, type, data, data_len);
@@ -3548,7 +3548,7 @@ LONG WINAPI SHRegEnumUSKeyA(HUSKEY hUSKey, DWORD index, char *name, DWORD *name_
 {
     HKEY dokey;

-    TRACE("%p, %d, %p, %p(%d), %d\n", hUSKey, index, name, name_len, *name_len, flags);
+    TRACE("%p, %ld, %p, %p(%ld), %d\n", hUSKey, index, name, name_len, *name_len, flags);

if ((flags == SHREGENUM_HKCU || flags == SHREGENUM_DEFAULT) && (dokey = reg_get_hkey_from_huskey(hUSKey, TRUE)))
         return RegEnumKeyExA(dokey, index, name, name_len, 0, 0, 0, 0);
@@ -3564,7 +3564,7 @@ LONG WINAPI SHRegEnumUSKeyW(HUSKEY hUSKey, DWORD index, WCHAR *name, DWORD *name
 {
     HKEY dokey;

-    TRACE("%p, %d, %p, %p(%d), %d\n", hUSKey, index, name, name_len, *name_len, flags);
+    TRACE("%p, %ld, %p, %p(%ld), %d\n", hUSKey, index, name, name_len, *name_len, flags);

if ((flags == SHREGENUM_HKCU || flags == SHREGENUM_DEFAULT) && (dokey = reg_get_hkey_from_huskey(hUSKey, TRUE)))
         return RegEnumKeyExW(dokey, index, name, name_len, 0, 0, 0, 0);
@@ -3591,7 +3591,7 @@ LONG WINAPI SHRegOpenUSKeyW(const WCHAR *path, REGSAM access_mask, HUSKEY relati
     LONG ret2, ret1 = ~ERROR_SUCCESS;
     struct USKEY *key;

-    TRACE("%s, %#x, %p, %p, %d\n", debugstr_w(path), access_mask, relative_key, uskey, ignore_hkcu);
+    TRACE("%s, %#lx, %p, %p, %d\n", debugstr_w(path), access_mask, relative_key, uskey, ignore_hkcu);

if (uskey)
         *uskey = NULL;
@@ -3627,7 +3627,7 @@ LONG WINAPI SHRegOpenUSKeyW(const WCHAR *path, REGSAM access_mask, HUSKEY relati
         key->HKLMkey = 0;

if (ret1 || ret2)
-        TRACE("one or more opens failed: HKCU=%d HKLM=%d\n", ret1, ret2);
+        TRACE("one or more opens failed: HKCU=%ld HKLM=%ld\n", ret1, ret2);

if (ret1 && ret2)
     {
@@ -3659,7 +3659,7 @@ LONG WINAPI SHRegWriteUSValueW(HUSKEY hUSKey, const WCHAR *value, DWORD type, vo
     LONG ret = ERROR_SUCCESS;
     DWORD dummy;

-    TRACE("%p, %s, %d, %p, %d, %#x\n", hUSKey, debugstr_w(value), type, data, data_len, flags);
+    TRACE("%p, %s, %ld, %p, %ld, %#lx\n", hUSKey, debugstr_w(value), type, data, data_len, flags);

__TRY
     {
@@ -3679,7 +3679,7 @@ LONG WINAPI SHRegWriteUSValueW(HUSKEY hUSKey, const WCHAR *value, DWORD type, vo
             /* Create the key */
             ret = RegCreateKeyExW(hKey->HKCUstart, hKey->path, 0, NULL, REG_OPTION_NON_VOLATILE,
                                   MAXIMUM_ALLOWED, NULL, &hKey->HKCUkey, NULL);
-            TRACE("Creating HKCU key, ret = %d\n", ret);
+            TRACE("Creating HKCU key, ret = %ld\n", ret);
             if (ret && (flags & SHREGSET_FORCE_HKCU))
             {
                 hKey->HKCUkey = 0;
@@ -3693,7 +3693,7 @@ LONG WINAPI SHRegWriteUSValueW(HUSKEY hUSKey, const WCHAR *value, DWORD type, vo
             {
                 /* Doesn't exist or we are forcing: Write value */
                 ret = RegSetValueExW(hKey->HKCUkey, value, 0, type, data, data_len);
-                TRACE("Writing HKCU value, ret = %d\n", ret);
+                TRACE("Writing HKCU value, ret = %ld\n", ret);
             }
         }
     }
@@ -3705,7 +3705,7 @@ LONG WINAPI SHRegWriteUSValueW(HUSKEY hUSKey, const WCHAR *value, DWORD type, vo
             /* Create the key */
             ret = RegCreateKeyExW(hKey->HKLMstart, hKey->path, 0, NULL, REG_OPTION_NON_VOLATILE,
                                   MAXIMUM_ALLOWED, NULL, &hKey->HKLMkey, NULL);
-            TRACE("Creating HKLM key, ret = %d\n", ret);
+            TRACE("Creating HKLM key, ret = %ld\n", ret);
             if (ret && (flags & (SHREGSET_FORCE_HKLM)))
             {
                 hKey->HKLMkey = 0;
@@ -3719,7 +3719,7 @@ LONG WINAPI SHRegWriteUSValueW(HUSKEY hUSKey, const WCHAR *value, DWORD type, vo
             {
                 /* Doesn't exist or we are forcing: Write value */
                 ret = RegSetValueExW(hKey->HKLMkey, value, 0, type, data, data_len);
-                TRACE("Writing HKLM value, ret = %d\n", ret);
+                TRACE("Writing HKLM value, ret = %ld\n", ret);
             }
         }
     }
@@ -3734,7 +3734,7 @@ LONG WINAPI SHRegSetUSValueA(const char *subkey, const char *value, DWORD type,
     HUSKEY hkey;
     LONG ret;

-    TRACE("%s, %s, %d, %p, %d, %#x\n", debugstr_a(subkey), debugstr_a(value), type, data, data_len, flags);
+    TRACE("%s, %s, %ld, %p, %ld, %#lx\n", debugstr_a(subkey), debugstr_a(value), type, data, data_len, flags);

if (!data)
         return ERROR_INVALID_FUNCTION;
@@ -3758,7 +3758,7 @@ LONG WINAPI SHRegSetUSValueW(const WCHAR *subkey, const WCHAR *value, DWORD type
     HUSKEY hkey;
     LONG ret;

-    TRACE("%s, %s, %d, %p, %d, %#x\n", debugstr_w(subkey), debugstr_w(value), type, data, data_len, flags);
+    TRACE("%s, %s, %ld, %p, %ld, %#lx\n", debugstr_w(subkey), debugstr_w(value), type, data, data_len, flags);

if (!data)
         return ERROR_INVALID_FUNCTION;
@@ -3832,14 +3832,14 @@ LONG WINAPI SHRegQueryUSValueA(HUSKEY hUSKey, const char *value, DWORD *type, vo
     if (!ignore_hkcu && (dokey = reg_get_hkey_from_huskey(hUSKey, TRUE)))
     {
         ret = RegQueryValueExA(dokey, value, 0, type, data, data_len);
-        TRACE("HKCU RegQueryValue returned %d\n", ret);
+        TRACE("HKCU RegQueryValue returned %ld\n", ret);
     }

/* If HKCU did not work and HKLM exists, then try it */
     if ((ret != ERROR_SUCCESS) && (dokey = reg_get_hkey_from_huskey(hUSKey, FALSE)))
     {
         ret = RegQueryValueExA(dokey, value, 0, type, data, data_len);
-        TRACE("HKLM RegQueryValue returned %d\n", ret);
+        TRACE("HKLM RegQueryValue returned %ld\n", ret);
     }

/* If neither worked, and default data exists, then use it */
@@ -3869,14 +3869,14 @@ LONG WINAPI SHRegQueryUSValueW(HUSKEY hUSKey, const WCHAR *value, DWORD *type, v
     if (!ignore_hkcu && (dokey = reg_get_hkey_from_huskey(hUSKey, TRUE)))
     {
         ret = RegQueryValueExW(dokey, value, 0, type, data, data_len);
-        TRACE("HKCU RegQueryValue returned %d\n", ret);
+        TRACE("HKCU RegQueryValue returned %ld\n", ret);
     }

/* If HKCU did not work and HKLM exists, then try it */
     if ((ret != ERROR_SUCCESS) && (dokey = reg_get_hkey_from_huskey(hUSKey, FALSE)))
     {
         ret = RegQueryValueExW(dokey, value, 0, type, data, data_len);
-        TRACE("HKLM RegQueryValue returned %d\n", ret);
+        TRACE("HKLM RegQueryValue returned %ld\n", ret);
     }

/* If neither worked, and default data exists, then use it */
@@ -3904,7 +3904,7 @@ LONG WINAPI SHRegGetUSValueA(const char *subkey, const char *value, DWORD *type,
     if (!data || !data_len)
         return ERROR_INVALID_FUNCTION; /* FIXME:wrong*/

-    TRACE("%s, %s, %d\n", debugstr_a(subkey), debugstr_a(value), *data_len);
+    TRACE("%s, %s, %ld\n", debugstr_a(subkey), debugstr_a(value), *data_len);

ret = SHRegOpenUSKeyA(subkey, KEY_QUERY_VALUE, 0, &myhuskey, ignore_hkcu);
     if (!ret)
@@ -3925,7 +3925,7 @@ LONG WINAPI SHRegGetUSValueW(const WCHAR *subkey, const WCHAR *value, DWORD *typ
     if (!data || !data_len)
         return ERROR_INVALID_FUNCTION; /* FIXME:wrong*/

-    TRACE("%s, %s, %d\n", debugstr_w(subkey), debugstr_w(value), *data_len);
+    TRACE("%s, %s, %ld\n", debugstr_w(subkey), debugstr_w(value), *data_len);

ret = SHRegOpenUSKeyW(subkey, KEY_QUERY_VALUE, 0, &myhuskey, ignore_hkcu);
     if (!ret)
@@ -3967,10 +3967,10 @@ BOOL WINAPI SHRegGetBoolUSValueA(const char *subkey, const char *value, BOOL ign
                     break;
                 }
             default:
-                FIXME("Unsupported registry data type %d\n", type);
+                FIXME("Unsupported registry data type %ld\n", type);
                 ret = FALSE;
         }
-        TRACE("got value (type=%d), returning %d\n", type, ret);
+        TRACE("got value (type=%ld), returning %d\n", type, ret);
     }
     else
         TRACE("returning default value %d\n", ret);
@@ -4008,10 +4008,10 @@ BOOL WINAPI SHRegGetBoolUSValueW(const WCHAR *subkey, const WCHAR *value, BOOL i
                     break;
                 }
             default:
-                FIXME("Unsupported registry data type %d\n", type);
+                FIXME("Unsupported registry data type %ld\n", type);
                 ret = FALSE;
         }
-        TRACE("got value (type=%d), returning %d\n", type, ret);
+        TRACE("got value (type=%ld), returning %d\n", type, ret);
     }
     else
         TRACE("returning default value %d\n", ret);
diff --git a/dlls/kernelbase/security.c b/dlls/kernelbase/security.c
index d5f5280e979..26878982b6f 100644
--- a/dlls/kernelbase/security.c
+++ b/dlls/kernelbase/security.c
@@ -195,33 +195,33 @@ static const char *debugstr_sid( PSID sid )
     case 0:
         return wine_dbg_sprintf("S-%d-%d", psid->Revision, auth);
     case 1:
-        return wine_dbg_sprintf("S-%d-%d-%u", psid->Revision, auth,
+        return wine_dbg_sprintf("S-%d-%d-%lu", psid->Revision, auth,
                                 psid->SubAuthority[0]);
     case 2:
-        return wine_dbg_sprintf("S-%d-%d-%u-%u", psid->Revision, auth,
+        return wine_dbg_sprintf("S-%d-%d-%lu-%lu", psid->Revision, auth,
                                 psid->SubAuthority[0], psid->SubAuthority[1]);
     case 3:
-        return wine_dbg_sprintf("S-%d-%d-%u-%u-%u", psid->Revision, auth,
+        return wine_dbg_sprintf("S-%d-%d-%lu-%lu-%lu", psid->Revision, auth,
                                 psid->SubAuthority[0], psid->SubAuthority[1], psid->SubAuthority[2]);
     case 4:
-        return wine_dbg_sprintf("S-%d-%d-%u-%u-%u-%u", psid->Revision, auth,
+        return wine_dbg_sprintf("S-%d-%d-%lu-%lu-%lu-%lu", psid->Revision, auth,
                                 psid->SubAuthority[0], psid->SubAuthority[1], psid->SubAuthority[2],
                                 psid->SubAuthority[3]);
     case 5:
-        return wine_dbg_sprintf("S-%d-%d-%u-%u-%u-%u-%u", psid->Revision, auth,
+        return wine_dbg_sprintf("S-%d-%d-%lu-%lu-%lu-%lu-%lu", psid->Revision, auth,
                                 psid->SubAuthority[0], psid->SubAuthority[1], psid->SubAuthority[2],
                                 psid->SubAuthority[3], psid->SubAuthority[4]);
     case 6:
-        return wine_dbg_sprintf("S-%d-%d-%u-%u-%u-%u-%u-%u", psid->Revision, auth,
+        return wine_dbg_sprintf("S-%d-%d-%lu-%lu-%lu-%lu-%lu-%lu", psid->Revision, auth,
                                 psid->SubAuthority[3], psid->SubAuthority[1], psid->SubAuthority[2],
                                 psid->SubAuthority[0], psid->SubAuthority[4], psid->SubAuthority[5]);
     case 7:
-        return wine_dbg_sprintf("S-%d-%d-%u-%u-%u-%u-%u-%u-%u", psid->Revision, auth,
+        return wine_dbg_sprintf("S-%d-%d-%lu-%lu-%lu-%lu-%lu-%lu-%lu", psid->Revision, auth,
                                 psid->SubAuthority[0], psid->SubAuthority[1], psid->SubAuthority[2],
                                 psid->SubAuthority[3], psid->SubAuthority[4], psid->SubAuthority[5],
                                 psid->SubAuthority[6]);
     case 8:
-        return wine_dbg_sprintf("S-%d-%d-%u-%u-%u-%u-%u-%u-%u-%u", psid->Revision, auth,
+        return wine_dbg_sprintf("S-%d-%d-%lu-%lu-%lu-%lu-%lu-%lu-%lu-%lu", psid->Revision, auth,
                                 psid->SubAuthority[0], psid->SubAuthority[1], psid->SubAuthority[2],
                                 psid->SubAuthority[3], psid->SubAuthority[4], psid->SubAuthority[5],
                                 psid->SubAuthority[6], psid->SubAuthority[7]);
@@ -556,7 +556,7 @@ BOOL WINAPI AdjustTokenPrivileges( HANDLE token, BOOL disable, PTOKEN_PRIVILEGES
 {
     NTSTATUS status;

-    TRACE("(%p %d %p %d %p %p)\n", token, disable, new, len, prev, ret_len );
+    TRACE("(%p %d %p %ld %p %p)\n", token, disable, new, len, prev, ret_len );

status = NtAdjustPrivilegesToken( token, disable, new, len, prev, ret_len );
     SetLastError( RtlNtStatusToDosError( status ));
@@ -624,7 +624,7 @@ BOOL WINAPI CheckTokenMembership( HANDLE token, PSID sid_to_check, PBOOL is_memb

for (i = 0; i < token_groups->GroupCount; i++)
     {
-        TRACE("Groups[%d]: {0x%x, %s}\n", i,
+        TRACE("Groups[%ld]: {0x%lx, %s}\n", i,
             token_groups->Groups[i].Attributes,
             debugstr_sid(token_groups->Groups[i].Sid));
         if ((token_groups->Groups[i].Attributes & SE_GROUP_ENABLED) &&
@@ -654,7 +654,7 @@ BOOL WINAPI CreateRestrictedToken( HANDLE token, DWORD flags,
     TOKEN_GROUPS *nt_disable_sids = NULL, *nt_restrict_sids = NULL;
     NTSTATUS status = STATUS_NO_MEMORY;

-    TRACE("token %p, flags %#x, disable_sids %u %p, delete_privs %u %p, restrict_sids %u %p, ret %p\n",
+    TRACE("token %p, flags %#lx, disable_sids %lu %p, delete_privs %lu %p, restrict_sids %lu %p, ret %p\n",
             token, flags, disable_sid_count, disable_sids, delete_priv_count, delete_privs,
             restrict_sid_count, restrict_sids, ret);

@@ -704,7 +704,7 @@ BOOL WINAPI DuplicateTokenEx( HANDLE token, DWORD access, LPSECURITY_ATTRIBUTES
 {
     OBJECT_ATTRIBUTES attr;

-    TRACE("%p 0x%08x 0x%08x 0x%08x %p\n", token, access, level, type, ret );
+    TRACE("%p 0x%08lx 0x%08x 0x%08x %p\n", token, access, level, type, ret );

InitializeObjectAttributes( &attr, NULL, (sa && sa->bInheritHandle) ? OBJ_INHERIT : 0,
                                 NULL, sa ? sa->lpSecurityDescriptor : NULL );
@@ -717,7 +717,7 @@ BOOL WINAPI DuplicateTokenEx( HANDLE token, DWORD access, LPSECURITY_ATTRIBUTES
 BOOL WINAPI GetTokenInformation( HANDLE token, TOKEN_INFORMATION_CLASS class,
                                  LPVOID info, DWORD len, LPDWORD retlen )
 {
-    TRACE("(%p, %s, %p, %d, %p):\n",
+    TRACE("(%p, %s, %p, %ld, %p):\n",
           token,
           (class == TokenUser) ? "TokenUser" :
           (class == TokenGroups) ? "TokenGroups" :
@@ -881,7 +881,7 @@ BOOL WINAPI SetThreadToken( PHANDLE thread, HANDLE token )
  */
 BOOL WINAPI SetTokenInformation( HANDLE token, TOKEN_INFORMATION_CLASS class, LPVOID info, DWORD len )
 {
-    TRACE("(%p, %s, %p, %d)\n",
+    TRACE("(%p, %s, %p, %ld)\n",
           token,
           (class == TokenUser) ? "TokenUser" :
           (class == TokenGroups) ? "TokenGroups" :
@@ -927,7 +927,7 @@ BOOL WINAPI ConvertToAutoInheritPrivateObjectSecurity( PSECURITY_DESCRIPTOR pare
  */
 HANDLE WINAPI CreateBoundaryDescriptorW( LPCWSTR name, ULONG flags )
 {
-    FIXME("%s %u - stub\n", debugstr_w(name), flags);
+    FIXME("%s %lu - stub\n", debugstr_w(name), flags);
     return NULL;
 }

@@ -952,7 +952,7 @@ BOOL WINAPI CreatePrivateObjectSecurityEx( PSECURITY_DESCRIPTOR parent, PSECURIT
     DWORD needed, offset;
     BYTE *buffer;

-    FIXME( "%p %p %p %p %d %u %p %p - returns fake SECURITY_DESCRIPTOR\n",
+    FIXME( "%p %p %p %p %d %lu %p %p - returns fake SECURITY_DESCRIPTOR\n",
            parent, creator, descr, type, is_container, flags, token, mapping );

needed = sizeof(SECURITY_DESCRIPTOR_RELATIVE);
@@ -1025,7 +1025,7 @@ BOOL WINAPI GetFileSecurityW( LPCWSTR name, SECURITY_INFORMATION info,
     NTSTATUS status;
     DWORD access = 0;

-    TRACE( "(%s,%d,%p,%d,%p)\n", debugstr_w(name), info, descr, len, ret_len );
+    TRACE( "(%s,%ld,%p,%ld,%p)\n", debugstr_w(name), info, descr, len, ret_len );

if (info & (OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION))
         access |= READ_CONTROL;
@@ -1060,7 +1060,7 @@ BOOL WINAPI GetPrivateObjectSecurity( PSECURITY_DESCRIPTOR obj_descr, SECURITY_I
     PACL pacl;
     PSID psid;

-    TRACE("(%p,0x%08x,%p,0x%08x,%p)\n", obj_descr, info, ret_descr, len, ret_len );
+    TRACE("(%p,0x%08lx,%p,0x%08lx,%p)\n", obj_descr, info, ret_descr, len, ret_len );

if (!InitializeSecurityDescriptor(&desc, SECURITY_DESCRIPTOR_REVISION)) return FALSE;

@@ -1200,7 +1200,7 @@ BOOL WINAPI SetFileSecurityW( LPCWSTR name, SECURITY_INFORMATION info, PSECURITY
     DWORD access = 0;
     NTSTATUS status;

-    TRACE( "(%s, 0x%x, %p)\n", debugstr_w(name), info, descr );
+    TRACE( "(%s, 0x%lx, %p)\n", debugstr_w(name), info, descr );

if (info & (OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION)) access |= WRITE_OWNER;
     if (info & SACL_SECURITY_INFORMATION) access |= ACCESS_SYSTEM_SECURITY;
@@ -1229,7 +1229,7 @@ BOOL WINAPI SetPrivateObjectSecurity( SECURITY_INFORMATION info, PSECURITY_DESCR
                                       PSECURITY_DESCRIPTOR *obj_descr, PGENERIC_MAPPING mapping,
                                       HANDLE token )
 {
-    FIXME( "0x%08x %p %p %p %p - stub\n", info, descr, obj_descr, mapping, token );
+    FIXME( "0x%08lx %p %p %p %p - stub\n", info, descr, obj_descr, mapping, token );
     return TRUE;
 }

@@ -1240,7 +1240,7 @@ BOOL WINAPI SetPrivateObjectSecurityEx( SECURITY_INFORMATION info, PSECURITY_DES
                                         PSECURITY_DESCRIPTOR *obj_descr, ULONG flags,
                                         PGENERIC_MAPPING mapping, HANDLE token )
 {
-    FIXME( "0x%08x %p %p %u %p %p - stub\n", info, descr, obj_descr, flags, mapping, token );
+    FIXME( "0x%08lx %p %p %lu %p %p - stub\n", info, descr, obj_descr, flags, mapping, token );
     return TRUE;
 }

@@ -1312,7 +1312,7 @@ BOOL WINAPI AccessCheckAndAuditAlarmW( LPCWSTR subsystem, LPVOID id, LPWSTR type
                                        PGENERIC_MAPPING mapping, BOOL creation,
                                        LPDWORD granted, LPBOOL status, LPBOOL on_close )
 {
-    FIXME( "stub (%s,%p,%s,%s,%p,%08x,%p,%x,%p,%p,%p)\n", debugstr_w(subsystem),
+    FIXME( "stub (%s,%p,%s,%s,%p,%08lx,%p,%x,%p,%p,%p)\n", debugstr_w(subsystem),
            id, debugstr_w(type_name), debugstr_w(name), descr, access, mapping,
            creation, granted, status, on_close );
     return TRUE;
@@ -1522,7 +1522,7 @@ BOOL WINAPI ObjectOpenAuditAlarmW( LPCWSTR subsystem, LPVOID id, LPWSTR type, LP
                                    DWORD granted, PPRIVILEGE_SET privs, BOOL creation,
                                    BOOL access, LPBOOL on_close )
 {
-    FIXME( "stub (%s,%p,%s,%s,%p,%p,0x%08x,0x%08x,%p,%x,%x,%p)\n", debugstr_w(subsystem),
+    FIXME( "stub (%s,%p,%s,%s,%p,%p,0x%08lx,0x%08lx,%p,%x,%x,%p)\n", debugstr_w(subsystem),
            id, debugstr_w(type), debugstr_w(name), descr, token, desired, granted,
            privs, creation, access, on_close );
     return TRUE;
@@ -1534,7 +1534,7 @@ BOOL WINAPI ObjectOpenAuditAlarmW( LPCWSTR subsystem, LPVOID id, LPWSTR type, LP
 BOOL WINAPI ObjectPrivilegeAuditAlarmW( LPCWSTR subsystem, LPVOID id, HANDLE token,
                                         DWORD desired, PPRIVILEGE_SET privs, BOOL granted )
 {
-    FIXME( "stub (%s,%p,%p,0x%08x,%p,%x)\n", debugstr_w(subsystem), id, token, desired, privs, granted );
+    FIXME( "stub (%s,%p,%p,0x%08lx,%p,%x)\n", debugstr_w(subsystem), id, token, desired, privs, granted );
     return TRUE;
 }

@@ -1553,7 +1553,7 @@ BOOL WINAPI PrivilegedServiceAuditAlarmW( LPCWSTR subsystem, LPCWSTR service, HA
  */
 BOOL WINAPI SetAclInformation( PACL acl, LPVOID info, DWORD len, ACL_INFORMATION_CLASS class )
 {
-    FIXME( "%p %p 0x%08x 0x%08x - stub\n", acl, info, len, class );
+    FIXME( "%p %p 0x%08lx 0x%08x - stub\n", acl, info, len, class );
     return TRUE;
 }

@@ -1562,6 +1562,6 @@ BOOL WINAPI SetAclInformation( PACL acl, LPVOID info, DWORD len, ACL_INFORMATION
  */
 BOOL WINAPI SetCachedSigningLevel( PHANDLE source, ULONG count, ULONG flags, HANDLE file )
 {
-    FIXME( "%p %u %u %p - stub\n", source, count, flags, file );
+    FIXME( "%p %lu %lu %p - stub\n", source, count, flags, file );
     return TRUE;
 }
diff --git a/dlls/kernelbase/string.c b/dlls/kernelbase/string.c
index f5d4468ae6c..798bc1f3d63 100644
--- a/dlls/kernelbase/string.c
+++ b/dlls/kernelbase/string.c
@@ -836,13 +836,13 @@ BOOL WINAPI StrToInt64ExA(const char *str, DWORD flags, LONGLONG *ret)
     BOOL negative = FALSE;
     LONGLONG value = 0;

-    TRACE("%s, %#x, %p\n", wine_dbgstr_a(str), flags, ret);
+    TRACE("%s, %#lx, %p\n", wine_dbgstr_a(str), flags, ret);

if (!str || !ret)
         return FALSE;

if (flags > STIF_SUPPORT_HEX)
-        WARN("Unknown flags %#x\n", flags);
+        WARN("Unknown flags %#lx\n", flags);

/* Skip leading space, '+', '-' */
     while (*str == ' ' || *str == '\t' || *str == '\n') str++;
@@ -899,13 +899,13 @@ BOOL WINAPI StrToInt64ExW(const WCHAR *str, DWORD flags, LONGLONG *ret)
     BOOL negative = FALSE;
     LONGLONG value = 0;

-    TRACE("%s, %#x, %p\n", wine_dbgstr_w(str), flags, ret);
+    TRACE("%s, %#lx, %p\n", wine_dbgstr_w(str), flags, ret);

if (!str || !ret)
         return FALSE;

if (flags > STIF_SUPPORT_HEX)
-        WARN("Unknown flags %#x.\n", flags);
+        WARN("Unknown flags %#lx.\n", flags);

/* Skip leading space, '+', '-' */
     while (*str == ' ' || *str == '\t' || *str == '\n') str++;
@@ -962,7 +962,7 @@ BOOL WINAPI StrToIntExA(const char *str, DWORD flags, INT *ret)
     LONGLONG value;
     BOOL res;

-    TRACE("%s, %#x, %p\n", wine_dbgstr_a(str), flags, ret);
+    TRACE("%s, %#lx, %p\n", wine_dbgstr_a(str), flags, ret);

res = StrToInt64ExA(str, flags, &value);
     if (res) *ret = value;
@@ -974,7 +974,7 @@ BOOL WINAPI StrToIntExW(const WCHAR *str, DWORD flags, INT *ret)
     LONGLONG value;
     BOOL res;

-    TRACE("%s, %#x, %p\n", wine_dbgstr_w(str), flags, ret);
+    TRACE("%s, %#lx, %p\n", wine_dbgstr_w(str), flags, ret);

res = StrToInt64ExW(str, flags, &value);
     if (res) *ret = value;
@@ -1415,7 +1415,7 @@ WCHAR * WINAPI StrCatBuffW(WCHAR *str, const WCHAR *cat, INT max_len)

DWORD WINAPI StrCatChainW(WCHAR *str, DWORD max_len, DWORD at, const WCHAR *cat)
 {
-    TRACE("%s, %u, %d, %s\n", wine_dbgstr_w(str), max_len, at, wine_dbgstr_w(cat));
+    TRACE("%s, %lu, %ld, %s\n", wine_dbgstr_w(str), max_len, at, wine_dbgstr_w(cat));

if (at == -1)
         at = lstrlenW(str);
diff --git a/dlls/kernelbase/sync.c b/dlls/kernelbase/sync.c
index 1ae72c770eb..5c4fb76536f 100644
--- a/dlls/kernelbase/sync.c
+++ b/dlls/kernelbase/sync.c
@@ -229,7 +229,7 @@ HANDLE WINAPI DECLSPEC_HOTPATCH RegisterWaitForSingleObjectEx( HANDLE handle, WA
 {
     HANDLE ret;

-    TRACE( "%p %p %p %d %d\n", handle, callback, context, timeout, flags );
+    TRACE( "%p %p %p %ld %ld\n", handle, callback, context, timeout, flags );

handle = normalize_std_handle( handle );
     if (!set_ntstatus( RtlRegisterWait( &ret, handle, callback, context, timeout, flags ))) return NULL;
@@ -246,7 +246,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH SignalObjectAndWait( HANDLE signal, HANDLE wait,
     NTSTATUS status;
     LARGE_INTEGER time;

-    TRACE( "%p %p %d %d\n", signal, wait, timeout, alertable );
+    TRACE( "%p %p %ld %d\n", signal, wait, timeout, alertable );

status = NtSignalAndWaitForSingleObject( signal, wait, alertable, get_nt_timeout( &time, timeout ) );
     if (HIWORD(status))
@@ -778,7 +778,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetWaitableTimerEx( HANDLE handle, const LARGE_INT
                                                   REASON_CONTEXT *context, ULONG tolerabledelay )
 {
     static int once;
-    if (!once++) FIXME( "(%p, %p, %d, %p, %p, %p, %d) semi-stub\n",
+    if (!once++) FIXME( "(%p, %p, %ld, %p, %p, %p, %ld) semi-stub\n",
                         handle, when, period, callback, arg, context, tolerabledelay );

return SetWaitableTimer( handle, when, period, callback, arg, FALSE );
@@ -1016,7 +1016,7 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateIoCompletionPort( HANDLE handle, HANDLE po
     IO_STATUS_BLOCK iosb;
     HANDLE ret = port;

-    TRACE( "(%p, %p, %08lx, %08x)\n", handle, port, key, threads );
+    TRACE( "(%p, %p, %08Ix, %08lx)\n", handle, port, key, threads );

if (!port)
     {
@@ -1053,7 +1053,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetQueuedCompletionStatus( HANDLE port, LPDWORD co
     IO_STATUS_BLOCK iosb;
     LARGE_INTEGER wait_time;

-    TRACE( "(%p,%p,%p,%p,%d)\n", port, count, key, overlapped, timeout );
+    TRACE( "(%p,%p,%p,%p,%ld)\n", port, count, key, overlapped, timeout );

*overlapped = NULL;
     status = NtRemoveIoCompletion( port, key, (PULONG_PTR)overlapped, &iosb,
@@ -1081,7 +1081,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetQueuedCompletionStatusEx( HANDLE port, OVERLAPP
     LARGE_INTEGER time;
     NTSTATUS ret;

-    TRACE( "%p %p %u %p %u %u\n", port, entries, count, written, timeout, alertable );
+    TRACE( "%p %p %lu %p %lu %u\n", port, entries, count, written, timeout, alertable );

ret = NtRemoveIoCompletionEx( port, (FILE_IO_COMPLETION_INFORMATION *)entries, count,
                                   written, get_nt_timeout( &time, timeout ), alertable );
@@ -1099,7 +1099,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetQueuedCompletionStatusEx( HANDLE port, OVERLAPP
 BOOL WINAPI DECLSPEC_HOTPATCH PostQueuedCompletionStatus( HANDLE port, DWORD count,
                                                           ULONG_PTR key, LPOVERLAPPED overlapped )
 {
-    TRACE( "%p %d %08lx %p\n", port, count, key, overlapped );
+    TRACE( "%p %ld %08Ix %p\n", port, count, key, overlapped );

return set_ntstatus( NtSetIoCompletion( port, key, (ULONG_PTR)overlapped, STATUS_SUCCESS, count ));
 }
@@ -1121,7 +1121,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH CallNamedPipeW( LPCWSTR name, LPVOID input, DWORD
     BOOL ret;
     DWORD mode;

-    TRACE( "%s %p %d %p %d %p %d\n", debugstr_w(name),
+    TRACE( "%s %p %ld %p %ld %p %ld\n", debugstr_w(name),
            input, in_size, output, out_size, read_size, timeout );

pipe = CreateFileW( name, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL );
@@ -1185,7 +1185,7 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateNamedPipeW( LPCWSTR name, DWORD open_mode,
     IO_STATUS_BLOCK iosb;
     LARGE_INTEGER time;

-    TRACE( "(%s, %#08x, %#08x, %d, %d, %d, %d, %p)\n", debugstr_w(name),
+    TRACE( "(%s, %#08lx, %#08lx, %ld, %ld, %ld, %ld, %p)\n", debugstr_w(name),
            open_mode, pipe_mode, instances, out_buff, in_buff, timeout, sa );

if (!RtlDosPathNameToNtPathName_U( name, &nt_name, NULL, NULL ))
@@ -1318,7 +1318,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetNamedPipeHandleStateW( HANDLE pipe, DWORD *stat
 {
     IO_STATUS_BLOCK io;

-    FIXME( "%p %p %p %p %p %p %d: semi-stub\n", pipe, state, instances, max_count, timeout, user, size );
+    FIXME( "%p %p %p %p %p %p %ld: semi-stub\n", pipe, state, instances, max_count, timeout, user, size );

if (max_count) *max_count = 0;
     if (timeout) *timeout = 0;
@@ -1417,7 +1417,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetNamedPipeHandleState( HANDLE pipe, LPDWORD mode
     IO_STATUS_BLOCK iosb;
     NTSTATUS status = STATUS_SUCCESS;

-    TRACE( "%p %p/%d %p %p\n", pipe, mode, mode ? *mode : 0, count, timeout );
+    TRACE( "%p %p/%ld %p %p\n", pipe, mode, mode ? *mode : 0, count, timeout );
     if (count || timeout) FIXME( "Unsupported arguments\n" );

if (mode)
@@ -1447,7 +1447,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH TransactNamedPipe( HANDLE handle, LPVOID write_buf
     void *cvalue = NULL;
     NTSTATUS status;

-    TRACE( "%p %p %u %p %u %p %p\n", handle,
+    TRACE( "%p %p %lu %p %lu %p %p\n", handle,
            write_buf, write_size, read_buf, read_size, bytes_read, overlapped );

if (overlapped)
@@ -1488,7 +1488,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH WaitNamedPipeW( LPCWSTR name, DWORD timeout )
     ULONG wait_size;
     HANDLE pipe_dev;

-    TRACE( "%s 0x%08x\n", debugstr_w(name), timeout );
+    TRACE( "%s 0x%08lx\n", debugstr_w(name), timeout );

if (!RtlDosPathNameToNtPathName_U( name, &nt_name, NULL, NULL )) return FALSE;

diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c
index e9c12d85771..6ba58cf0a67 100644
--- a/dlls/kernelbase/thread.c
+++ b/dlls/kernelbase/thread.c
@@ -512,7 +512,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetThreadGroupAffinity( HANDLE thread, const GROUP
  */
 DWORD WINAPI DECLSPEC_HOTPATCH SetThreadIdealProcessor( HANDLE thread, DWORD proc )
 {
-    FIXME( "(%p %u): stub\n", thread, proc );
+    FIXME( "(%p %lu): stub\n", thread, proc );
     if (proc > MAXIMUM_PROCESSORS)
     {
         SetLastError( ERROR_INVALID_PARAMETER );
diff --git a/dlls/kernelbase/version.c b/dlls/kernelbase/version.c
index ff37b26c674..01e29d55dfc 100644
--- a/dlls/kernelbase/version.c
+++ b/dlls/kernelbase/version.c
@@ -248,7 +248,7 @@ done:
             && nt->OptionalHeader.MinorOperatingSystemVersion >= 3)))
     {
         if (current_version.dwMajorVersion > 10)
-            FIXME("Unsupported current_version.dwMajorVersion %u.\n", current_version.dwMajorVersion);
+            FIXME("Unsupported current_version.dwMajorVersion %lu.\n", current_version.dwMajorVersion);

ver = nt->OptionalHeader.MajorOperatingSystemVersion >= 10 ? NULL : &windows8_1_version_info;
     }
@@ -628,7 +628,7 @@ static void print_vffi_debug(const VS_FIXEDFILEINFO *vffi)
     {
         WORD mode = LOWORD(vffi->dwFileVersionMS);
         WORD ver_rev = HIWORD(vffi->dwFileVersionLS);
-        TRACE("fileversion=%u.%u.%u.%u (%s.major.minor.release), ",
+        TRACE("fileversion=%lu.%u.%u.%u (%s.major.minor.release), ",
             (vffi->dwFileVersionMS),
             HIBYTE(ver_rev), LOBYTE(ver_rev), LOWORD(vffi->dwFileVersionLS),
             (mode == 3) ? "Usermode" : ((mode <= 2) ? "Kernelmode" : "?") );
@@ -643,7 +643,7 @@ static void print_vffi_debug(const VS_FIXEDFILEINFO *vffi)
           HIWORD(vffi->dwProductVersionMS),LOWORD(vffi->dwProductVersionMS),
           HIWORD(vffi->dwProductVersionLS),LOWORD(vffi->dwProductVersionLS));

-    TRACE("flagmask=0x%x, flags=0x%x %s%s%s%s%s%s\n",
+    TRACE("flagmask=0x%lx, flags=0x%lx %s%s%s%s%s%s\n",
           vffi->dwFileFlagsMask, vffi->dwFileFlags,
           (vffi->dwFileFlags & VS_FF_DEBUG) ? "DEBUG," : "",
           (vffi->dwFileFlags & VS_FF_PRERELEASE) ? "PRERELEASE," : "",
@@ -664,7 +664,7 @@ static void print_vffi_debug(const VS_FIXEDFILEINFO *vffi)
     case VOS_NT:TRACE("NT,");break;
     case VOS_UNKNOWN:
     default:
-        TRACE("UNKNOWN(0x%x),",vffi->dwFileOS&0xFFFF0000);break;
+        TRACE("UNKNOWN(0x%lx),",vffi->dwFileOS&0xFFFF0000);break;
     }

switch (LOWORD(vffi->dwFileOS))
@@ -689,7 +689,7 @@ static void print_vffi_debug(const VS_FIXEDFILEINFO *vffi)
         {
             if(versioned_printer) /* NT3.x/NT4.0 or old w2k Driver  */
                 TRACE(",PRINTER");
-            TRACE(" (subtype=0x%x)", vffi->dwFileSubtype);
+            TRACE(" (subtype=0x%lx)", vffi->dwFileSubtype);
         }
         break;
     case VFT_DRV:
@@ -710,7 +710,7 @@ static void print_vffi_debug(const VS_FIXEDFILEINFO *vffi)
         case VFT2_DRV_VERSIONED_PRINTER:TRACE("VERSIONED_PRINTER");break;
         case VFT2_UNKNOWN:
         default:
-            TRACE("UNKNOWN(0x%x)",vffi->dwFileSubtype);break;
+            TRACE("UNKNOWN(0x%lx)",vffi->dwFileSubtype);break;
         }
         break;
     case VFT_FONT:
@@ -720,18 +720,18 @@ static void print_vffi_debug(const VS_FIXEDFILEINFO *vffi)
         case VFT2_FONT_RASTER:TRACE("RASTER");break;
         case VFT2_FONT_VECTOR:TRACE("VECTOR");break;
         case VFT2_FONT_TRUETYPE:TRACE("TRUETYPE");break;
-        default:TRACE("UNKNOWN(0x%x)",vffi->dwFileSubtype);break;
+        default:TRACE("UNKNOWN(0x%lx)",vffi->dwFileSubtype);break;
         }
         break;
     case VFT_VXD:TRACE("filetype=VXD");break;
     case VFT_STATIC_LIB:TRACE("filetype=STATIC_LIB");break;
     case VFT_UNKNOWN:
     default:
-        TRACE("filetype=Unknown(0x%x)",vffi->dwFileType);break;
+        TRACE("filetype=Unknown(0x%lx)",vffi->dwFileType);break;
     }

TRACE("\n");
-    TRACE("filedate=0x%x.0x%x\n",vffi->dwFileDateMS,vffi->dwFileDateLS);
+    TRACE("filedate=0x%lx.0x%lx\n",vffi->dwFileDateMS,vffi->dwFileDateLS);
 }

/***********************************************************************
@@ -758,7 +758,7 @@ DWORD WINAPI GetFileVersionInfoSizeExW( DWORD flags, LPCWSTR filename, LPDWORD r
     DWORD len, offset, magic = 1;
     HMODULE hModule;

-    TRACE("(0x%x,%s,%p)\n", flags, debugstr_w(filename), ret_handle );
+    TRACE("(0x%lx,%s,%p)\n", flags, debugstr_w(filename), ret_handle );

if (ret_handle) *ret_handle = 0;

@@ -773,7 +773,7 @@ DWORD WINAPI GetFileVersionInfoSizeExW( DWORD flags, LPCWSTR filename, LPDWORD r
         return 0;
     }
     if (flags & ~FILE_VER_GET_LOCALISED)
-        FIXME("flags 0x%x ignored\n", flags & ~FILE_VER_GET_LOCALISED);
+        FIXME("flags 0x%lx ignored\n", flags & ~FILE_VER_GET_LOCALISED);

if ((hModule = LoadLibraryExW( filename, 0, LOAD_LIBRARY_AS_DATAFILE )))
     {
@@ -846,7 +846,7 @@ DWORD WINAPI GetFileVersionInfoSizeExA( DWORD flags, LPCSTR filename, LPDWORD ha
     UNICODE_STRING filenameW;
     DWORD retval;

-    TRACE("(0x%x,%s,%p)\n", flags, debugstr_a(filename), handle );
+    TRACE("(0x%lx,%s,%p)\n", flags, debugstr_a(filename), handle );

if(filename)
         RtlCreateUnicodeStringFromAsciiz(&filenameW, filename);
@@ -870,7 +870,7 @@ BOOL WINAPI GetFileVersionInfoExW( DWORD flags, LPCWSTR filename, DWORD ignored,
     HMODULE hModule;
     VS_VERSION_INFO_STRUCT32* vvis = data;

-    TRACE("(0x%x,%s,%d,size=%d,data=%p)\n",
+    TRACE("(0x%lx,%s,%ld,size=%ld,data=%p)\n",
           flags, debugstr_w(filename), ignored, datasize, data );

if (!data)
@@ -879,7 +879,7 @@ BOOL WINAPI GetFileVersionInfoExW( DWORD flags, LPCWSTR filename, DWORD ignored,
         return FALSE;
     }
     if (flags & ~FILE_VER_GET_LOCALISED)
-        FIXME("flags 0x%x ignored\n", flags & ~FILE_VER_GET_LOCALISED);
+        FIXME("flags 0x%lx ignored\n", flags & ~FILE_VER_GET_LOCALISED);

if ((hModule = LoadLibraryExW( filename, 0, LOAD_LIBRARY_AS_DATAFILE )))
     {
@@ -950,7 +950,7 @@ BOOL WINAPI GetFileVersionInfoExA( DWORD flags, LPCSTR filename, DWORD handle, D
     UNICODE_STRING filenameW;
     BOOL retval;

-    TRACE("(0x%x,%s,%d,size=%d,data=%p)\n",
+    TRACE("(0x%lx,%s,%ld,size=%ld,data=%p)\n",
           flags, debugstr_a(filename), handle, datasize, data );

if(filename)
@@ -1290,7 +1290,7 @@ DWORD WINAPI VerFindFileA( DWORD flags, LPCSTR filename, LPCSTR win_dir, LPCSTR
     const char *destDir;
     char winDir[MAX_PATH], systemDir[MAX_PATH];

-    TRACE("flags = %x filename=%s windir=%s appdir=%s curdirlen=%p(%u) destdirlen=%p(%u)\n",
+    TRACE("flags = %lx filename=%s windir=%s appdir=%s curdirlen=%p(%u) destdirlen=%p(%u)\n",
           flags, debugstr_a(filename), debugstr_a(win_dir), debugstr_a(app_dir),
           curdir_len, curdir_len ? *curdir_len : 0, dest_len, dest_len ? *dest_len : 0 );

@@ -1358,7 +1358,7 @@ DWORD WINAPI VerFindFileA( DWORD flags, LPCSTR filename, LPCSTR win_dir, LPCSTR
         *curdir_len = len;
     }

-    TRACE("ret = %u (%s%s%s) curdir=%s destdir=%s\n", retval,
+    TRACE("ret = %lu (%s%s%s) curdir=%s destdir=%s\n", retval,
           (retval & VFF_CURNEDEST) ? "VFF_CURNEDEST " : "",
           (retval & VFF_FILEINUSE) ? "VFF_FILEINUSE " : "",
           (retval & VFF_BUFFTOOSMALL) ? "VFF_BUFFTOOSMALL " : "",
@@ -1377,7 +1377,7 @@ DWORD WINAPI VerFindFileW( DWORD flags, LPCWSTR filename, LPCWSTR win_dir, LPCWS
     const WCHAR *curDir;
     const WCHAR *destDir;

-    TRACE("flags = %x filename=%s windir=%s appdir=%s curdirlen=%p(%u) destdirlen=%p(%u)\n",
+    TRACE("flags = %lx filename=%s windir=%s appdir=%s curdirlen=%p(%u) destdirlen=%p(%u)\n",
           flags, debugstr_w(filename), debugstr_w(win_dir), debugstr_w(app_dir),
           curdir_len, curdir_len ? *curdir_len : 0, dest_len, dest_len ? *dest_len : 0 );

@@ -1437,7 +1437,7 @@ DWORD WINAPI VerFindFileW( DWORD flags, LPCWSTR filename, LPCWSTR win_dir, LPCWS
         *curdir_len = len;
     }

-    TRACE("ret = %u (%s%s%s) curdir=%s destdir=%s\n", retval,
+    TRACE("ret = %lu (%s%s%s) curdir=%s destdir=%s\n", retval,
           (retval & VFF_CURNEDEST) ? "VFF_CURNEDEST " : "",
           (retval & VFF_FILEINUSE) ? "VFF_FILEINUSE " : "",
           (retval & VFF_BUFFTOOSMALL) ? "VFF_BUFFTOOSMALL " : "",
@@ -1486,7 +1486,7 @@ BOOL WINAPI GetVersionExA( OSVERSIONINFOA *info )
     if (info->dwOSVersionInfoSize != sizeof(OSVERSIONINFOA) &&
         info->dwOSVersionInfoSize != sizeof(OSVERSIONINFOEXA))
     {
-        WARN( "wrong OSVERSIONINFO size from app (got: %d)\n", info->dwOSVersionInfoSize );
+        WARN( "wrong OSVERSIONINFO size from app (got: %ld)\n", info->dwOSVersionInfoSize );
         SetLastError( ERROR_INSUFFICIENT_BUFFER );
         return FALSE;
     }
@@ -1523,7 +1523,7 @@ BOOL WINAPI GetVersionExW( OSVERSIONINFOW *info )
     if (info->dwOSVersionInfoSize != sizeof(OSVERSIONINFOW) &&
         info->dwOSVersionInfoSize != sizeof(OSVERSIONINFOEXW))
     {
-        WARN( "wrong OSVERSIONINFO size from app (got: %d)\n", info->dwOSVersionInfoSize );
+        WARN( "wrong OSVERSIONINFO size from app (got: %ld)\n", info->dwOSVersionInfoSize );
         return FALSE;
     }

diff --git a/dlls/kernelbase/volume.c b/dlls/kernelbase/volume.c
index d513dda1f9d..39386867aa3 100644
--- a/dlls/kernelbase/volume.c
+++ b/dlls/kernelbase/volume.c
@@ -198,7 +198,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetVolumeInformationW( LPCWSTR root, LPWSTR label,

if (status)
     {
-        TRACE( "cannot open device %s: %x\n", debugstr_w(nt_name.Buffer), status );
+        TRACE( "cannot open device %s: %lx\n", debugstr_w(nt_name.Buffer), status );
         if (status == STATUS_ACCESS_DENIED)
             MESSAGE( "wine: Read access denied for device %s, FS volume label and serial are not available.\n", debugstr_w(nt_name.Buffer) );
         status = NtOpenFile( &handle, SYNCHRONIZE, &attr, &io, 0,
@@ -264,7 +264,7 @@ BOOL WINAPI GetVolumeNameForVolumeMountPointW( LPCWSTR path, LPWSTR volume, DWOR
     BOOL ret = FALSE;
     DWORD br;

-    TRACE("(%s, %p, %x)\n", debugstr_w(path), volume, size);
+    TRACE("(%s, %p, %lx)\n", debugstr_w(path), volume, size);
     if (path[lstrlenW(path)-1] != '\')
     {
         SetLastError( ERROR_INVALID_NAME );
@@ -309,7 +309,7 @@ BOOL WINAPI GetVolumeNameForVolumeMountPointW( LPCWSTR path, LPWSTR volume, DWOR
     /* We will then take that and get the volume name        */
     nonpersist_name = (WCHAR *)(input + 1);
     status = read_nt_symlink( symlink_name, nonpersist_name, (i_size - sizeof(*input)) / sizeof(WCHAR) );
-    TRACE("read_nt_symlink got stat=%x, for %s, got <%s>\n", status,
+    TRACE("read_nt_symlink got stat=%lx, for %s, got <%s>\n", status,
             debugstr_w(symlink_name), debugstr_w(nonpersist_name));
     if (status != STATUS_SUCCESS)
     {
@@ -333,7 +333,7 @@ BOOL WINAPI GetVolumeNameForVolumeMountPointW( LPCWSTR path, LPWSTR volume, DWOR
         goto err_ret;

/* Verify and return the data, note string is not null terminated  */
-    TRACE("found %d matching mount points\n", output->NumberOfMountPoints);
+    TRACE("found %ld matching mount points\n", output->NumberOfMountPoints);
     if (output->NumberOfMountPoints < 1)
     {
         SetLastError( ERROR_NO_VOLUME_ID );
@@ -390,10 +390,10 @@ BOOL WINAPI DECLSPEC_HOTPATCH DefineDosDeviceW( DWORD flags, const WCHAR *device
     NTSTATUS status;
     HANDLE handle;

-    TRACE("%#x, %s, %s\n", flags, debugstr_w(device), debugstr_w(target));
+    TRACE("%#lx, %s, %s\n", flags, debugstr_w(device), debugstr_w(target));

if (flags & ~(DDD_RAW_TARGET_PATH | DDD_REMOVE_DEFINITION))
-        FIXME("Ignoring flags %#x.\n", flags & ~(DDD_RAW_TARGET_PATH | DDD_REMOVE_DEFINITION));
+        FIXME("Ignoring flags %#lx.\n", flags & ~(DDD_RAW_TARGET_PATH | DDD_REMOVE_DEFINITION));

lstrcatW( link_name, device );
     RtlInitUnicodeString( &nt_name, link_name );
@@ -721,7 +721,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetDiskFreeSpaceW( LPCWSTR root, LPDWORD cluster_s
     if (sector_bytes) *sector_bytes = info.BytesPerSector;
     if (free_clusters) *free_clusters = info.AvailableAllocationUnits.u.LowPart;
     if (total_clusters) *total_clusters = info.TotalAllocationUnits.u.LowPart;
-    TRACE("%#08x, %#08x, %#08x, %#08x\n", info.SectorsPerAllocationUnit, info.BytesPerSector,
+    TRACE("%#08lx, %#08lx, %#08lx, %#08lx\n", info.SectorsPerAllocationUnit, info.BytesPerSector,
           info.AvailableAllocationUnits.u.LowPart, info.TotalAllocationUnits.u.LowPart);
     return TRUE;
 }
@@ -941,7 +941,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetVolumePathNamesForVolumeNameW( LPCWSTR volumena
     BOOL ret = FALSE;
     UINT i, j;

-    TRACE("%s, %p, %u, %p\n", debugstr_w(volumename), volumepathname, buflen, returnlen);
+    TRACE("%s, %p, %lu, %p\n", debugstr_w(volumename), volumepathname, buflen, returnlen);

if (!volumename || (len = lstrlenW( volumename )) != 49)
     {
@@ -1112,7 +1112,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH FindNextVolumeW( HANDLE handle, LPWSTR volume, DWO
         volume[1] = '\';  /* map ??\ to \?\ */
         volume[size / sizeof(WCHAR)] = '\';  /* Windows appends a backslash */
         volume[size / sizeof(WCHAR) + 1] = 0;
-        TRACE( "returning entry %u %s\n", data->Size - 1, debugstr_w(volume) );
+        TRACE( "returning entry %lu %s\n", data->Size - 1, debugstr_w(volume) );
         return TRUE;
     }
     SetLastError( ERROR_NO_MORE_FILES );

[PATCH 19/23] dlls/krnl386.exe16: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech

---
 dlls/krnl386.exe16/Makefile.in  |    1 
 dlls/krnl386.exe16/dosmem.c     |    2 -
 dlls/krnl386.exe16/file.c       |    2 -
 dlls/krnl386.exe16/global.c     |    8 ++--
 dlls/krnl386.exe16/instr.c      |   14 +++---
 dlls/krnl386.exe16/int21.c      |   50 +++++++++++------------
 dlls/krnl386.exe16/int25.c      |    4 +-
 dlls/krnl386.exe16/int26.c      |    4 +-
 dlls/krnl386.exe16/int2f.c      |   18 ++++----
 dlls/krnl386.exe16/int31.c      |   18 ++++----
 dlls/krnl386.exe16/interrupts.c |   12 +++--
 dlls/krnl386.exe16/ioports.c    |    4 +-
 dlls/krnl386.exe16/kernel.c     |   12 +++--
 dlls/krnl386.exe16/ne_module.c  |    2 -
 dlls/krnl386.exe16/ne_segment.c |    4 +-
 dlls/krnl386.exe16/relay.c      |    4 +-
 dlls/krnl386.exe16/resource.c   |    2 -
 dlls/krnl386.exe16/snoop.c      |    6 +--
 dlls/krnl386.exe16/syslevel.c   |   10 ++---
 dlls/krnl386.exe16/task.c       |    6 +--
 dlls/krnl386.exe16/thunk.c      |   56 +++++++++++++------------
 dlls/krnl386.exe16/utthunk.c    |    2 -
 dlls/krnl386.exe16/vxd.c        |   86 ++++++++++++++++++++-------------------
 dlls/krnl386.exe16/wowthunk.c   |    4 +-
 24 files changed, 165 insertions(+), 166 deletions(-)

diff --git a/dlls/krnl386.exe16/Makefile.in b/dlls/krnl386.exe16/Makefile.in
index 83ae0ea97c3..75f561c1d4b 100644
--- a/dlls/krnl386.exe16/Makefile.in
+++ b/dlls/krnl386.exe16/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = krnl386.exe16
 IMPORTLIB = kernel
 DELAYIMPORTS = user32
diff --git a/dlls/krnl386.exe16/dosmem.c b/dlls/krnl386.exe16/dosmem.c
index 64df77a3747..79ea4039d5d 100644
--- a/dlls/krnl386.exe16/dosmem.c
+++ b/dlls/krnl386.exe16/dosmem.c
@@ -487,7 +487,7 @@ LPVOID DOSMEM_MapRealToLinear(DWORD x)
    LPVOID       lin;

lin = DOSMEM_dosmem + HIWORD(x) * 16 + LOWORD(x);
-   TRACE_(selector)("(0x%08x) returns %p.\n", x, lin );
+   TRACE_(selector)("(0x%08lx) returns %p.\n", x, lin );
    return lin;
 }

diff --git a/dlls/krnl386.exe16/file.c b/dlls/krnl386.exe16/file.c
index 6e50baf0fe1..5eab0559883 100644
--- a/dlls/krnl386.exe16/file.c
+++ b/dlls/krnl386.exe16/file.c
@@ -418,7 +418,7 @@ LONG WINAPI WIN16_hread( HFILE16 hFile, SEGPTR buffer, LONG count )
 {
     LONG maxlen;

-    TRACE("%d %08x %d\n", hFile, (DWORD)buffer, count );
+    TRACE("%d %08lx %ld\n", hFile, (DWORD)buffer, count );

/* Some programs pass a count larger than the allocated buffer */
     maxlen = GetSelectorLimit16( SELECTOROF(buffer) ) - OFFSETOF(buffer) + 1;
diff --git a/dlls/krnl386.exe16/global.c b/dlls/krnl386.exe16/global.c
index 2eb02b8cef3..0c9dc1563f0 100644
--- a/dlls/krnl386.exe16/global.c
+++ b/dlls/krnl386.exe16/global.c
@@ -198,7 +198,7 @@ HGLOBAL16 GLOBAL_Alloc( UINT16 flags, DWORD size, HGLOBAL16 hOwner, unsigned cha
     HGLOBAL16 handle;
     DWORD align = 0x1f;

-    TRACE("%d flags=%04x\n", size, flags );
+    TRACE("%ld flags=%04x\n", size, flags );

/* If size is 0, create a discarded block */

@@ -275,7 +275,7 @@ HGLOBAL16 WINAPI GlobalReAlloc16(
     WORD sel = GlobalHandleToSel16( handle );
     HANDLE heap = get_win16_heap();

-    TRACE("%04x %d flags=%04x\n",
+    TRACE("%04x %ld flags=%04x\n",
                     handle, size, flags );
     if (!handle) return 0;

@@ -327,7 +327,7 @@ HGLOBAL16 WINAPI GlobalReAlloc16(

ptr = pArena->base;
     oldsize = pArena->size;
-    TRACE("oldbase %p oldsize %08x newsize %08x\n", ptr,oldsize,size);
+    TRACE("oldbase %p oldsize %08lx newsize %08lx\n", ptr,oldsize,size);
     if (ptr && (size == oldsize)) return handle;  /* Nothing to do */

if (pArena->flags & GA_DOSMEM)
@@ -453,7 +453,7 @@ HGLOBAL16 WINAPI GlobalFree16(
 SEGPTR WINAPI K32WOWGlobalLock16( HGLOBAL16 handle )
 {
     WORD sel = GlobalHandleToSel16( handle );
-    TRACE("(%04x) -> %08x\n", handle, MAKELONG( 0, sel ) );
+    TRACE("(%04x) -> %08lx\n", handle, MAKELONG( 0, sel ) );

if (handle)
     {
diff --git a/dlls/krnl386.exe16/instr.c b/dlls/krnl386.exe16/instr.c
index 1b1ed2d9633..b21a00d5ccf 100644
--- a/dlls/krnl386.exe16/instr.c
+++ b/dlls/krnl386.exe16/instr.c
@@ -385,7 +385,7 @@ static DWORD INSTR_inport( WORD port, int size, CONTEXT *context )
                      (WORD)context->SegCs, LOWORD(context->Eip));
             break;
         case 4:
-            TRACE_(io)( "0x%x < %08x @ %04x:%04x\n", port, res,
+            TRACE_(io)( "0x%x < %08lx @ %04x:%04x\n", port, res,
                      (WORD)context->SegCs, LOWORD(context->Eip));
             break;
         }
@@ -416,7 +416,7 @@ static void INSTR_outport( WORD port, int size, DWORD val, CONTEXT *context )
                     (WORD)context->SegCs, LOWORD(context->Eip));
             break;
         case 4:
-            TRACE_(io)("0x%x > %08x @ %04x:%04x\n", port, val,
+            TRACE_(io)("0x%x > %08lx @ %04x:%04x\n", port, val,
                     (WORD)context->SegCs, LOWORD(context->Eip));
             break;
         }
@@ -523,7 +523,7 @@ DWORD __wine_emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context )
                 switch (instr[2])
                 {
                 case 0xc0:
-                    FIXME("mov %%eax, %%cr0 at 0x%08x, EAX=0x%08x\n",
+                    FIXME("mov %%eax, %%cr0 at 0x%08lx, EAX=0x%08lx\n",
                           context->Eip,context->Eax );
                           context->Eip += prefixlen+3;
                     return ExceptionContinueExecution;
@@ -546,12 +546,12 @@ DWORD __wine_emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context )
                      * bit 7: PGE Enable global pages
                      * bit 8: PCE Enable performance counters at IPL3
                      */
-                    FIXME("mov %%cr4, %%eax at 0x%08x\n",context->Eip);
+                    FIXME("mov %%cr4, %%eax at 0x%08lx\n",context->Eip);
                     context->Eax = 0;
                     context->Eip += prefixlen+3;
                     return ExceptionContinueExecution;
                 case 0xc0: /* mov %cr0, %eax */
-                    FIXME("mov %%cr0, %%eax at 0x%08x\n",context->Eip);
+                    FIXME("mov %%cr0, %%eax at 0x%08lx\n",context->Eip);
                     context->Eax = 0x10; /* FIXME: set more bits ? */
                     context->Eip += prefixlen+3;
                     return ExceptionContinueExecution;
@@ -564,12 +564,12 @@ DWORD __wine_emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context )
                 switch (instr[2])
                 {
                 case 0xc8: /* mov %dr1, %eax */
-                    TRACE("mov %%dr1, %%eax at 0x%08x\n",context->Eip);
+                    TRACE("mov %%dr1, %%eax at 0x%08lx\n",context->Eip);
                     context->Eax = context->Dr1;
                     context->Eip += prefixlen+3;
                     return ExceptionContinueExecution;
                 case 0xf8: /* mov %dr7, %eax */
-                    TRACE("mov %%dr7, %%eax at 0x%08x\n",context->Eip);
+                    TRACE("mov %%dr7, %%eax at 0x%08lx\n",context->Eip);
                     context->Eax = 0x400;
                     context->Eip += prefixlen+3;
                     return ExceptionContinueExecution;
diff --git a/dlls/krnl386.exe16/int21.c b/dlls/krnl386.exe16/int21.c
index 6340de86ccc..50cc3fa7f2e 100644
--- a/dlls/krnl386.exe16/int21.c
+++ b/dlls/krnl386.exe16/int21.c
@@ -1174,7 +1174,7 @@ static void INT21_SequentialReadFromFCB( CONTEXT *context )
         record_number = 128 * fcb->current_block_number + fcb->record_within_current_block;
         position = SetFilePointer(handle, record_number * fcb->logical_record_size, NULL, 0);
         if (position != record_number * fcb->logical_record_size) {
-            TRACE("seek(%d, %d, 0) failed with %u\n",
+            TRACE("seek(%d, %ld, 0) failed with %lu\n",
                   fcb->file_number, record_number * fcb->logical_record_size, position);
             AL_result = 0x01; /* end of file, no data read */
         } else {
@@ -1190,7 +1190,7 @@ static void INT21_SequentialReadFromFCB( CONTEXT *context )
                     AL_result = 0x03; /* end of file, partial record read */
                 } /* if */
             } else {
-                TRACE("successful read %d bytes from record %d (position %u) of file %d (handle %p)\n",
+                TRACE("successful read %d bytes from record %ld (position %lu) of file %d (handle %p)\n",
                     bytes_read, record_number, position, fcb->file_number, handle);
                 AL_result = 0x00; /* successful */
             } /* if */
@@ -1254,7 +1254,7 @@ static void INT21_SequentialWriteToFCB( CONTEXT *context )
         record_number = 128 * fcb->current_block_number + fcb->record_within_current_block;
         position = SetFilePointer(handle, record_number * fcb->logical_record_size, NULL, 0);
         if (position != record_number * fcb->logical_record_size) {
-            TRACE("seek(%d, %d, 0) failed with %u\n",
+            TRACE("seek(%d, %ld, 0) failed with %lu\n",
                   fcb->file_number, record_number * fcb->logical_record_size, position);
             AL_result = 0x01; /* disk full */
         } else {
@@ -1265,7 +1265,7 @@ static void INT21_SequentialWriteToFCB( CONTEXT *context )
                       fcb->file_number, disk_transfer_area, fcb->logical_record_size, bytes_written);
                 AL_result = 0x01; /* disk full */
             } else {
-                TRACE("successful written %d bytes from record %d (position %u) of file %d (handle %p)\n",
+                TRACE("successful written %d bytes from record %ld (position %lu) of file %d (handle %p)\n",
                     bytes_written, record_number, position, fcb->file_number, handle);
                 AL_result = 0x00; /* successful */
             } /* if */
@@ -1330,7 +1330,7 @@ static void INT21_ReadRandomRecordFromFCB( CONTEXT *context )
     } else {
         position = SetFilePointer(handle, record_number * fcb->logical_record_size, NULL, 0);
         if (position != record_number * fcb->logical_record_size) {
-            TRACE("seek(%d, %d, 0) failed with %u\n",
+            TRACE("seek(%d, %ld, 0) failed with %lu\n",
                   fcb->file_number, record_number * fcb->logical_record_size, position);
             AL_result = 0x01; /* end of file, no data read */
         } else {
@@ -1346,7 +1346,7 @@ static void INT21_ReadRandomRecordFromFCB( CONTEXT *context )
                     AL_result = 0x03; /* end of file, partial record read */
                 } /* if */
             } else {
-                TRACE("successful read %d bytes from record %d (position %u) of file %d (handle %p)\n",
+                TRACE("successful read %d bytes from record %ld (position %lu) of file %d (handle %p)\n",
                     bytes_read, record_number, position, fcb->file_number, handle);
                 AL_result = 0x00; /* successful */
             } /* if */
@@ -1403,7 +1403,7 @@ static void INT21_WriteRandomRecordToFCB( CONTEXT *context )
     } else {
         position = SetFilePointer(handle, record_number * fcb->logical_record_size, NULL, 0);
         if (position != record_number * fcb->logical_record_size) {
-            TRACE("seek(%d, %d, 0) failed with %u\n",
+            TRACE("seek(%d, %ld, 0) failed with %lu\n",
                   fcb->file_number, record_number * fcb->logical_record_size, position);
             AL_result = 0x01; /* disk full */
         } else {
@@ -1414,7 +1414,7 @@ static void INT21_WriteRandomRecordToFCB( CONTEXT *context )
                       fcb->file_number, disk_transfer_area, fcb->logical_record_size, bytes_written);
                 AL_result = 0x01; /* disk full */
             } else {
-                TRACE("successful written %d bytes from record %d (position %u) of file %d (handle %p)\n",
+                TRACE("successful written %d bytes from record %ld (position %lu) of file %d (handle %p)\n",
                     bytes_written, record_number, position, fcb->file_number, handle);
                 AL_result = 0x00; /* successful */
             } /* if */
@@ -1482,7 +1482,7 @@ static void INT21_RandomBlockReadFromFCB( CONTEXT *context )
     } else {
         position = SetFilePointer(handle, record_number * fcb->logical_record_size, NULL, 0);
         if (position != record_number * fcb->logical_record_size) {
-            TRACE("seek(%d, %d, 0) failed with %u\n",
+            TRACE("seek(%d, %ld, 0) failed with %lu\n",
                   fcb->file_number, record_number * fcb->logical_record_size, position);
             records_read = 0;
             AL_result = 0x01; /* end of file, no data read */
@@ -1503,7 +1503,7 @@ static void INT21_RandomBlockReadFromFCB( CONTEXT *context )
                     AL_result = 0x03; /* end of file, partial record read */
                 } /* if */
             } else {
-                TRACE("successful read %d bytes from record %d (position %u) of file %d (handle %p)\n",
+                TRACE("successful read %d bytes from record %ld (position %lu) of file %d (handle %p)\n",
                     bytes_read, record_number, position, fcb->file_number, handle);
                 records_read = records_requested;
                 AL_result = 0x00; /* successful */
@@ -1573,7 +1573,7 @@ static void INT21_RandomBlockWriteToFCB( CONTEXT *context )
     } else {
         position = SetFilePointer(handle, record_number * fcb->logical_record_size, NULL, 0);
         if (position != record_number * fcb->logical_record_size) {
-            TRACE("seek(%d, %d, 0) failed with %u\n",
+            TRACE("seek(%d, %ld, 0) failed with %lu\n",
                   fcb->file_number, record_number * fcb->logical_record_size, position);
             records_written = 0;
             AL_result = 0x01; /* disk full */
@@ -1588,7 +1588,7 @@ static void INT21_RandomBlockWriteToFCB( CONTEXT *context )
                 records_written = bytes_written / fcb->logical_record_size;
                 AL_result = 0x01; /* disk full */
             } else {
-                TRACE("successful write %d bytes from record %d (position %u) of file %d (handle %p)\n",
+                TRACE("successful write %d bytes from record %ld (position %lu) of file %d (handle %p)\n",
                     bytes_written, record_number, position, fcb->file_number, handle);
                 records_written = records_requested;
                 AL_result = 0x00; /* successful */
@@ -3347,7 +3347,7 @@ static BOOL INT21_CreateTempFile( CONTEXT *context )

for (;;)
     {
-        sprintf( p, "wine%04x.%03d", GetCurrentThreadId(), counter );
+        sprintf( p, "wine%04lx.%03d", GetCurrentThreadId(), counter );
         counter = (counter + 1) % 1000;

SET_AX( context, 
@@ -3817,7 +3817,7 @@ void WINAPI DOSVM_Int21Handler( CONTEXT *context )
     BOOL bSetDOSExtendedError = FALSE;

TRACE( "AX=%04x BX=%04x CX=%04x DX=%04x "
-           "SI=%04x DI=%04x DS=%04x ES=%04x EFL=%08x\n",
+           "SI=%04x DI=%04x DS=%04x ES=%04x EFL=%08lx\n",
            AX_reg(context), BX_reg(context), 
            CX_reg(context), DX_reg(context),
            SI_reg(context), DI_reg(context),
@@ -3886,7 +3886,7 @@ void WINAPI DOSVM_Int21Handler( CONTEXT *context )
         break;

case 0x09: /* WRITE STRING TO STANDARD OUTPUT */
-        TRACE("WRITE '$'-terminated string from %04X:%04X to stdout\n",
+        TRACE("WRITE '$'-terminated string from %04lX:%04X to stdout\n",
          context->SegDs, DX_reg(context) );
         {
             LPSTR data = CTX_SEG_OFF_TO_LIN( context, 
@@ -3993,7 +3993,7 @@ void WINAPI DOSVM_Int21Handler( CONTEXT *context )
         break;

case 0x1a: /* SET DISK TRANSFER AREA ADDRESS */
-        TRACE( "SET DISK TRANSFER AREA ADDRESS %04X:%04X\n",
+        TRACE( "SET DISK TRANSFER AREA ADDRESS %04lX:%04X\n",
                context->SegDs, DX_reg(context) );
         {
             TDB *task = GlobalLock16( GetCurrentTask() );
@@ -4361,7 +4361,7 @@ void WINAPI DOSVM_Int21Handler( CONTEXT *context )
         break;

case 0x3f: /* "READ" - READ FROM FILE OR DEVICE */
-        TRACE( "READ from %d to %04X:%04X for %d bytes\n",
+        TRACE( "READ from %d to %04lX:%04X for %d bytes\n",
                BX_reg(context),
                context->SegDs,
                DX_reg(context),
@@ -4391,7 +4391,7 @@ void WINAPI DOSVM_Int21Handler( CONTEXT *context )
         break;

case 0x40:  /* "WRITE" - WRITE TO FILE OR DEVICE */
-        TRACE( "WRITE from %04X:%04X to handle %d for %d byte\n",
+        TRACE( "WRITE from %04lX:%04X to handle %d for %d byte\n",
                context->SegDs, DX_reg(context),
                BX_reg(context), CX_reg(context) );
         {
@@ -4426,7 +4426,7 @@ void WINAPI DOSVM_Int21Handler( CONTEXT *context )
         break;

case 0x42: /* "LSEEK" - SET CURRENT FILE POSITION */
-        TRACE( "LSEEK handle %d offset %d from %s\n",
+        TRACE( "LSEEK handle %d offset %ld from %s\n",
                BX_reg(context), 
                MAKELONG( DX_reg(context), CX_reg(context) ),
                (AL_reg(context) == 0) ? 
@@ -4520,7 +4520,7 @@ void WINAPI DOSVM_Int21Handler( CONTEXT *context )
    break;

case 0x49: /* FREE MEMORY */
-        TRACE( "FREE MEMORY segment %04X\n", context->SegEs );
+        TRACE( "FREE MEMORY segment %04lX\n", context->SegEs );
         {
             BOOL ok = !GlobalDOSFree16( context->SegEs );

@@ -4536,7 +4536,7 @@ void WINAPI DOSVM_Int21Handler( CONTEXT *context )
         break;

case 0x4a: /* RESIZE MEMORY BLOCK */
-        TRACE( "RESIZE MEMORY segment %04X to %d paragraphs\n",
+        TRACE( "RESIZE MEMORY segment %04lX to %d paragraphs\n",
                context->SegEs, BX_reg(context) );
         {
             FIXME( "Resize memory block - unsupported under Win16\n" );
@@ -4677,14 +4677,14 @@ void WINAPI DOSVM_Int21Handler( CONTEXT *context )
             switch (AL_reg(context))
             {
             case 0x00: /* LOCK */
-                TRACE( "lock handle %d offset %d length %d\n",
+                TRACE( "lock handle %d offset %ld length %ld\n",
                        BX_reg(context), offset, length );
                 if (!LockFile( handle, offset, 0, length, 0 ))
                     bSetDOSExtendedError = TRUE;
                 break;

case 0x01: /* UNLOCK */
-                TRACE( "unlock handle %d offset %d length %d\n",
+                TRACE( "unlock handle %d offset %ld length %ld\n",
                        BX_reg(context), offset, length );
                 if (!UnlockFile( handle, offset, 0, length, 0 ))
                     bSetDOSExtendedError = TRUE;
@@ -4873,10 +4873,10 @@ void WINAPI DOSVM_Int21Handler( CONTEXT *context )

/* Print error code if carry flag is set. */
     if (context->EFlags & 0x0001)
-        TRACE("failed, error %d\n", GetLastError() );
+        TRACE("failed, error %ld\n", GetLastError() );

TRACE( "returning: AX=%04x BX=%04x CX=%04x DX=%04x "
-           "SI=%04x DI=%04x DS=%04x ES=%04x EFL=%08x\n",
+           "SI=%04x DI=%04x DS=%04x ES=%04x EFL=%08lx\n",
            AX_reg(context), BX_reg(context), 
            CX_reg(context), DX_reg(context), 
            SI_reg(context), DI_reg(context),
diff --git a/dlls/krnl386.exe16/int25.c b/dlls/krnl386.exe16/int25.c
index 1f3f80a6e63..d414f27b8e9 100644
--- a/dlls/krnl386.exe16/int25.c
+++ b/dlls/krnl386.exe16/int25.c
@@ -39,8 +39,8 @@ BOOL DOSVM_RawRead(BYTE drive, DWORD begin, DWORD nr_sect, BYTE *dataptr, BOOL f
     WCHAR root[] = {'\','\','.','\','A',':',0};
     HANDLE h;

-    TRACE( "abs diskread, drive %d, sector %d, "
-           "count %d, buffer %p\n",
+    TRACE( "abs diskread, drive %d, sector %ld, "
+           "count %ld, buffer %p\n",
            drive, begin, nr_sect, dataptr );

root[4] += drive;
diff --git a/dlls/krnl386.exe16/int26.c b/dlls/krnl386.exe16/int26.c
index 0fc15eba2e6..9d08c1aeb46 100644
--- a/dlls/krnl386.exe16/int26.c
+++ b/dlls/krnl386.exe16/int26.c
@@ -39,8 +39,8 @@ BOOL DOSVM_RawWrite(BYTE drive, DWORD begin, DWORD nr_sect, BYTE *dataptr, BOOL
     HANDLE h;
     DWORD w;

-    TRACE( "abs diskwrite, drive %d, sector %d, "
-           "count %d, buffer %p\n",
+    TRACE( "abs diskwrite, drive %d, sector %ld, "
+           "count %ld, buffer %p\n",
            drive, begin, nr_sect, dataptr );

root[4] += drive;
diff --git a/dlls/krnl386.exe16/int2f.c b/dlls/krnl386.exe16/int2f.c
index a50486c28d2..7114a46e455 100644
--- a/dlls/krnl386.exe16/int2f.c
+++ b/dlls/krnl386.exe16/int2f.c
@@ -566,7 +566,7 @@ static void MSCDEX_Request(BYTE *driver_request)
                 ERR("CD-ROM driver: unsupported addressing mode !!\n");
                 Error = 0x0c;
             }
-            TRACE(" ----> HEAD LOCATION <%d>\n", PTR_AT(io_stru, 2, DWORD));
+            TRACE(" ----> HEAD LOCATION <%ld>\n", PTR_AT(io_stru, 2, DWORD));
             break;

case 4: /* Audio channel info */
@@ -598,13 +598,13 @@ static void MSCDEX_Request(BYTE *driver_request)
              * 0        see below (Door closed/opened)
              */
             if (!present) PTR_AT(io_stru, 1, DWORD) |= 1;
-            TRACE(" ----> DEVICE STATUS <0x%08x>\n", PTR_AT(io_stru, 1, DWORD));
+            TRACE(" ----> DEVICE STATUS <0x%08lx>\n", PTR_AT(io_stru, 1, DWORD));
             break;

case 8: /* Volume size */
             PTR_AT(io_stru, 1, DWORD) = FRAME_OF_TOC(toc, toc.LastTrack + 1) -
                 FRAME_OF_TOC(toc, toc.FirstTrack) - 1;
-            TRACE(" ----> VOLUME SIZE <%d>\n", PTR_AT(io_stru, 1, DWORD));
+            TRACE(" ----> VOLUME SIZE <%ld>\n", PTR_AT(io_stru, 1, DWORD));
             break;

case 9: /* media changed ? */
@@ -619,7 +619,7 @@ static void MSCDEX_Request(BYTE *driver_request)
             MSCDEX_StoreMSF(FRAME_OF_TOC(toc, toc.LastTrack + 1) -
                             FRAME_OF_TOC(toc, toc.FirstTrack) - 1, io_stru + 3);

-            TRACE(" ----> AUDIO DISK INFO <%d-%d/%08x>\n",
+            TRACE(" ----> AUDIO DISK INFO <%d-%d/%08lx>\n",
                   io_stru[1], io_stru[2], PTR_AT(io_stru, 3, DWORD));
             break;

@@ -632,7 +632,7 @@ static void MSCDEX_Request(BYTE *driver_request)
                 PTR_AT(io_stru, 2, DWORD) = 0;
                 io_stru[6] = 0;
             }
-            TRACE(" ----> AUDIO TRACK INFO[%d] = [%08x:%d]\n",
+            TRACE(" ----> AUDIO TRACK INFO[%d] = [%08lx:%d]\n",
                   io_stru[1], PTR_AT(io_stru, 2, DWORD), io_stru[6]);
             break;

@@ -675,7 +675,7 @@ static void MSCDEX_Request(BYTE *driver_request)
                 PTR_AT(io_stru, 3, DWORD) = FRAME_OF_TOC(toc, toc.FirstTrack);
                 PTR_AT(io_stru, 7, DWORD) = FRAME_OF_TOC(toc, toc.LastTrack + 1);
             }
-            TRACE("Audio status info: status=%04x startLoc=%d endLoc=%d\n",
+            TRACE("Audio status info: status=%04x startLoc=%ld endLoc=%ld\n",
                   PTR_AT(io_stru, 1, WORD), PTR_AT(io_stru, 3, DWORD), PTR_AT(io_stru, 7, DWORD));
             break;

@@ -766,7 +766,7 @@ static void MSCDEX_Request(BYTE *driver_request)

at = PTR_AT(driver_request, 20, DWORD);

-        TRACE(" --> SEEK AUDIO mode :<0x%02X>, [%d]\n", driver_request[13], at);
+        TRACE(" --> SEEK AUDIO mode :<0x%02X>, [%ld]\n", driver_request[13], at);

switch (driver_request[13]) {
         case 1: /* Red book addressing mode = 0:m:s:f */
@@ -800,7 +800,7 @@ static void MSCDEX_Request(BYTE *driver_request)
         beg = end = PTR_AT(driver_request, 14, DWORD);
         end += PTR_AT(driver_request, 18, DWORD);

-        TRACE(" --> PLAY AUDIO mode :<0x%02X>, [%d-%d]\n", driver_request[13], beg, end);
+        TRACE(" --> PLAY AUDIO mode :<0x%02X>, [%ld-%ld]\n", driver_request[13], beg, end);

switch (driver_request[13]) {
         case 1:
@@ -941,7 +941,7 @@ static void MSCDEX_Handler(CONTEXT* context)
            if (!driver_request) {
                /* FIXME - to be deleted ?? */
                ERR("ES:BX==0 ! SEGFAULT ?\n");
-               ERR("-->BX=0x%04x, ES=0x%04x, DS=0x%04x, CX=0x%04x\n",
+               ERR("-->BX=0x%04x, ES=0x%04lx, DS=0x%04lx, CX=0x%04x\n",
                    BX_reg(context), context->SegEs, context->SegDs, CX_reg(context));
                driver_request[4] |= 0x80;
                driver_request[3] = 5;  /* bad request length */
diff --git a/dlls/krnl386.exe16/int31.c b/dlls/krnl386.exe16/int31.c
index a97dd8b1728..b5af832f4f2 100644
--- a/dlls/krnl386.exe16/int31.c
+++ b/dlls/krnl386.exe16/int31.c
@@ -63,7 +63,7 @@ static LPVOID DPMI_xalloc( DWORD len )
             if (!xflag && (lastvalloced<oldlastv)) 
             { 
                 /* wrapped */
-                FIXME( "failed to allocate linearly growing memory (%u bytes), "
+                FIXME( "failed to allocate linearly growing memory (%lu bytes), "
                        "using non-linear growing...\n", len );
                 xflag++;
             }
@@ -75,7 +75,7 @@ static LPVOID DPMI_xalloc( DWORD len )
                 xflag++;

if ((xflag==2) && (lastvalloced < oldlastv)) {
-                FIXME( "failed to allocate any memory of %u bytes!\n", len );
+                FIXME( "failed to allocate any memory of %lu bytes!\n", len );
                 return NULL;
             }
         }
@@ -253,7 +253,7 @@ void WINAPI DOSVM_Int31Handler( CONTEXT *context )
         {
             DWORD base = MAKELONG( DX_reg(context), CX_reg(context) );
             WORD  sel = BX_reg(context);
-            TRACE( "set selector base address (0x%04x,0x%08x)\n", sel, base );
+            TRACE( "set selector base address (0x%04x,0x%08lx)\n", sel, base );

/* check if Win16 app wants to access lower 64K of DOS memory */
             if (base < 0x10000) DOSMEM_MapDosLayout();
@@ -265,7 +265,7 @@ void WINAPI DOSVM_Int31Handler( CONTEXT *context )
     case 0x0008:  /* Set selector limit */
         {
             DWORD limit = MAKELONG( DX_reg(context), CX_reg(context) );
-            TRACE( "set selector limit (0x%04x,0x%08x)\n",
+            TRACE( "set selector limit (0x%04x,0x%08lx)\n",
                    BX_reg(context), limit );
             SetSelectorLimit16( BX_reg(context), limit );
         }
@@ -385,7 +385,7 @@ void WINAPI DOSVM_Int31Handler( CONTEXT *context )
         break;

case 0x0205:  /* Set protected mode interrupt vector */
-        TRACE("set protected mode interrupt handler (0x%02x,0x%04x:0x%08x)\n",
+        TRACE("set protected mode interrupt handler (0x%02x,0x%04x:0x%08lx)\n",
               BL_reg(context), CX_reg(context), context->Edx);
         {
             FARPROC16 handler;
@@ -497,7 +497,7 @@ void WINAPI DOSVM_Int31Handler( CONTEXT *context )
             DWORD size = MAKELONG( CX_reg(context), BX_reg(context) );
             BYTE *ptr;

-            TRACE( "allocate memory block (%u bytes)\n", size );
+            TRACE( "allocate memory block (%lu bytes)\n", size );

ptr = DPMI_xalloc( size );
             if (!ptr)
@@ -518,7 +518,7 @@ void WINAPI DOSVM_Int31Handler( CONTEXT *context )
     case 0x0502:  /* Free memory block */
         {
             DWORD handle = MAKELONG( DI_reg(context), SI_reg(context) );
-            TRACE( "free memory block (0x%08x)\n", handle );
+            TRACE( "free memory block (0x%08lx)\n", handle );
             DPMI_xfree( (void *)handle );
         }
         break;
@@ -529,7 +529,7 @@ void WINAPI DOSVM_Int31Handler( CONTEXT *context )
             DWORD handle = MAKELONG( DI_reg(context), SI_reg(context) );
             BYTE *ptr;

-            TRACE( "resize memory block (0x%08x, %u bytes)\n", handle, size );
+            TRACE( "resize memory block (0x%08lx, %lu bytes)\n", handle, size );

ptr = DPMI_xrealloc( (void *)handle, size );
             if (!ptr)
@@ -591,7 +591,7 @@ void WINAPI DOSVM_Int31Handler( CONTEXT *context )
         break;

case 0x0800:  /* Physical address mapping */
-        FIXME( "physical address mapping (0x%08x) - unimplemented\n",
+        FIXME( "physical address mapping (0x%08lx) - unimplemented\n",
                MAKELONG(CX_reg(context),BX_reg(context)) );
         break;

diff --git a/dlls/krnl386.exe16/interrupts.c b/dlls/krnl386.exe16/interrupts.c
index 3c99eabcbba..23c12f2a244 100644
--- a/dlls/krnl386.exe16/interrupts.c
+++ b/dlls/krnl386.exe16/interrupts.c
@@ -241,10 +241,10 @@ static void DOSVM_HardwareInterruptPM( CONTEXT *context, BYTE intnum )
  */
 BOOL DOSVM_EmulateInterruptPM( CONTEXT *context, BYTE intnum )
 {
-    TRACE_(relay)("\1Call DOS int 0x%02x ret=%04x:%08x\n"
-                  "  eax=%08x ebx=%08x ecx=%08x edx=%08x\n"
-                  "  esi=%08x edi=%08x ebp=%08x esp=%08x\n"
-                  "  ds=%04x es=%04x fs=%04x gs=%04x ss=%04x flags=%08x\n",
+    TRACE_(relay)("\1Call DOS int 0x%02x ret=%04lx:%08lx\n"
+                  "  eax=%08lx ebx=%08lx ecx=%08lx edx=%08lx\n"
+                  "  esi=%08lx edi=%08lx ebp=%08lx esp=%08lx\n"
+                  "  ds=%04lx es=%04lx fs=%04lx gs=%04lx ss=%04lx flags=%08lx\n",
                   intnum, context->SegCs, context->Eip,
                   context->Eax, context->Ebx, context->Ecx, context->Edx,
                   context->Esi, context->Edi, context->Ebp, context->Esp,
@@ -262,7 +262,7 @@ BOOL DOSVM_EmulateInterruptPM( CONTEXT *context, BYTE intnum )

if (intnum != context->Eip / DOSVM_STUB_PM16)
             WARN( "interrupt stub has been modified "
-                  "(interrupt is %02x, interrupt stub is %02x)\n",
+                  "(interrupt is %02x, interrupt stub is %02lx)\n",
                   intnum, context->Eip/DOSVM_STUB_PM16 );

TRACE( "builtin interrupt %02x has been branched to\n", intnum );
@@ -555,7 +555,7 @@ static void WINAPI DOSVM_Int1aHandler( CONTEXT *context )
             SET_CX( context, HIWORD(data->Ticks) );
             SET_DX( context, LOWORD(data->Ticks) );
             SET_AL( context, 0 ); /* FIXME: midnight flag is unsupported */
-            TRACE( "GET SYSTEM TIME - ticks=%d\n", data->Ticks );
+            TRACE( "GET SYSTEM TIME - ticks=%ld\n", data->Ticks );
         }
         break;

diff --git a/dlls/krnl386.exe16/ioports.c b/dlls/krnl386.exe16/ioports.c
index 8a95dc9aa7b..7f795c2badf 100644
--- a/dlls/krnl386.exe16/ioports.c
+++ b/dlls/krnl386.exe16/ioports.c
@@ -177,7 +177,7 @@ static void set_timer(unsigned timer)
             /* speaker on ? */
             if ((parport_8255[1] & 3) == 3)
             {
-                TRACE("Beep (freq: %d) !\n", 1193180 / val);
+                TRACE("Beep (freq: %ld) !\n", 1193180 / val);
                 Beep(1193180 / val, 20);
             }
             break;
@@ -329,7 +329,7 @@ DWORD DOSVM_inport( int port, int size )
  */
 void DOSVM_outport( int port, int size, DWORD value )
 {
-    TRACE("IO: 0x%x (%d-byte value) to port 0x%04x\n", value, size, port );
+    TRACE("IO: 0x%lx (%d-byte value) to port 0x%04x\n", value, size, port );

DOSMEM_InitDosMemory();

diff --git a/dlls/krnl386.exe16/kernel.c b/dlls/krnl386.exe16/kernel.c
index 374fcb654d4..5891c7e0588 100644
--- a/dlls/krnl386.exe16/kernel.c
+++ b/dlls/krnl386.exe16/kernel.c
@@ -653,11 +653,11 @@ DWORD WINAPI MapProcessHandle( HANDLE hProcess )
  */
 void WINAPI SetProcessDword( DWORD dwProcessID, INT offset, DWORD value )
 {
-    TRACE("(%d, %d)\n", dwProcessID, offset );
+    TRACE("(%ld, %d)\n", dwProcessID, offset );

if (dwProcessID && dwProcessID != GetCurrentProcessId())
     {
-        ERR("%d: process %x not accessible\n", offset, dwProcessID);
+        ERR("%d: process %lx not accessible\n", offset, dwProcessID);
         return;
     }

@@ -697,11 +697,11 @@ DWORD WINAPI GetProcessDword( DWORD dwProcessID, INT offset )
     DWORD               x, y;
     STARTUPINFOW        siw;

-    TRACE("(%d, %d)\n", dwProcessID, offset );
+    TRACE("(%ld, %d)\n", dwProcessID, offset );

if (dwProcessID && dwProcessID != GetCurrentProcessId())
     {
-        ERR("%d: process %x not accessible\n", offset, dwProcessID);
+        ERR("%d: process %lx not accessible\n", offset, dwProcessID);
         return 0;
     }

@@ -808,7 +808,7 @@ DWORD WINAPI WaitForMultipleObjectsEx16( DWORD count, const HANDLE *handles,
  */
 VOID WINAPI VWin32_BoostThreadGroup( DWORD threadId, INT boost )
 {
-    FIXME("(0x%08x,%d): stub\n", threadId, boost);
+    FIXME("(0x%08lx,%d): stub\n", threadId, boost);
 }

@@ -817,7 +817,7 @@ VOID WINAPI VWin32_BoostThreadGroup( DWORD threadId, INT boost )
  */
 VOID WINAPI VWin32_BoostThreadStatic( DWORD threadId, INT boost )
 {
-    FIXME("(0x%08x,%d): stub\n", threadId, boost);
+    FIXME("(0x%08lx,%d): stub\n", threadId, boost);
 }

/***********************************************************************
diff --git a/dlls/krnl386.exe16/ne_module.c b/dlls/krnl386.exe16/ne_module.c
index c26fe778253..82b976fab6b 100644
--- a/dlls/krnl386.exe16/ne_module.c
+++ b/dlls/krnl386.exe16/ne_module.c
@@ -1234,7 +1234,7 @@ DWORD NE_StartTask(void)

/* Now call 16-bit entry point */

-        TRACE("Starting main program: cs:ip=%04x:%04x ds=%04x ss:sp=%04x:%04x\n",
+        TRACE("Starting main program: cs:ip=%04lx:%04lx ds=%04lx ss:sp=%04x:%04x\n",
               context.SegCs, context.Eip, context.SegDs, CURRENT_SS, CURRENT_SP);

WOWCallback16Ex( 0, WCB16_REGS, 0, NULL, (DWORD *)&context );
diff --git a/dlls/krnl386.exe16/ne_segment.c b/dlls/krnl386.exe16/ne_segment.c
index fd01dba540e..3eb8bae2ff3 100644
--- a/dlls/krnl386.exe16/ne_segment.c
+++ b/dlls/krnl386.exe16/ne_segment.c
@@ -543,7 +543,7 @@ static void NE_FixupSegmentPrologs(NE_MODULE *pModule, WORD segnum)
             if (entry->segnum == segnum)
             {
                 pFunc = pSeg+entry->offs;
-                TRACE("pFunc: %p, *(DWORD *)pFunc: %08x, num_entries: %d\n", pFunc, *(DWORD *)pFunc, num_entries);
+                TRACE("pFunc: %p, *(DWORD *)pFunc: %08lx, num_entries: %d\n", pFunc, *(DWORD *)pFunc, num_entries);
                 if (*(pFunc+2) == 0x90)
                 {
                     if (*(WORD *)pFunc == 0x581e) /* push ds, pop ax */
@@ -683,7 +683,7 @@ static BOOL NE_InitDLL( NE_MODULE *pModule )
     context.Ebp   = CURRENT_SP + FIELD_OFFSET(STACK16FRAME,bp);

pModule->ne_csip = 0;  /* Don't initialize it twice */
-    TRACE_(dll)("Calling LibMain for %.*s, cs:ip=%04x:%04x ds=%04x di=%04x cx=%04x\n",
+    TRACE_(dll)("Calling LibMain for %.*s, cs:ip=%04lx:%04lx ds=%04lx di=%04x cx=%04x\n",
                 *((BYTE*)pModule + pModule->ne_restab),
                 (char *)pModule + pModule->ne_restab + 1,
                 context.SegCs, context.Eip, context.SegDs,
diff --git a/dlls/krnl386.exe16/relay.c b/dlls/krnl386.exe16/relay.c
index 2ec657bd3f8..1532df52676 100644
--- a/dlls/krnl386.exe16/relay.c
+++ b/dlls/krnl386.exe16/relay.c
@@ -518,7 +518,7 @@ int relay_call_from_16( void *entry_point, unsigned char *args16, CONTEXT *conte
     if (!j)  /* register function */
     {
         args32[nb_args++] = (int)context;
-        TRACE( ") ret=%04x:%04x ax=%04x bx=%04x cx=%04x dx=%04x si=%04x di=%04x bp=%04x ss:sp=%04x:%04x ds=%04x es=%04x efl=%08x\n",
+        TRACE( ") ret=%04x:%04x ax=%04x bx=%04x cx=%04x dx=%04x si=%04x di=%04x bp=%04x ss:sp=%04x:%04x ds=%04x es=%04x efl=%08lx\n",
                frame->cs, frame->ip, (WORD)context->Eax, (WORD)context->Ebx, (WORD)context->Ecx,
                (WORD)context->Edx, (WORD)context->Esi, (WORD)context->Edi, (WORD)context->Ebp,
                (WORD)context->SegSs, (WORD)context->Esp, (WORD)context->SegDs, (WORD)context->SegEs, context->EFlags );
@@ -534,7 +534,7 @@ int relay_call_from_16( void *entry_point, unsigned char *args16, CONTEXT *conte
     TRACE( "\1Ret  %s.%d: %s() ", module, ordinal, func );
     if (!j)  /* register function */
     {
-        TRACE( "retval=none ret=%04x:%04x ax=%04x bx=%04x cx=%04x dx=%04x si=%04x di=%04x ds=%04x es=%04x efl=%08x\n",
+        TRACE( "retval=none ret=%04x:%04x ax=%04x bx=%04x cx=%04x dx=%04x si=%04x di=%04x ds=%04x es=%04x efl=%08lx\n",
                (WORD)context->SegCs, LOWORD(context->Eip), (WORD)context->Eax, (WORD)context->Ebx,
                (WORD)context->Ecx, (WORD)context->Edx, (WORD)context->Esi, (WORD)context->Edi,
                (WORD)context->SegDs, (WORD)context->SegEs, context->EFlags );
diff --git a/dlls/krnl386.exe16/resource.c b/dlls/krnl386.exe16/resource.c
index c303e25a2db..ec6440d6a66 100644
--- a/dlls/krnl386.exe16/resource.c
+++ b/dlls/krnl386.exe16/resource.c
@@ -869,7 +869,7 @@ HGLOBAL16 WINAPI AllocResource16( HMODULE16 hModule, HRSRC16 hRsrc, DWORD size)
     NE_MODULE *pModule = NE_GetPtr( hModule );
     if (!pModule || !pModule->ne_rsrctab || !hRsrc) return 0;

-    TRACE("module=%04x res=%04x size=%d\n", hModule, hRsrc, size );
+    TRACE("module=%04x res=%04x size=%ld\n", hModule, hRsrc, size );

sizeShift = *(WORD *)((char *)pModule + pModule->ne_rsrctab);
     pNameInfo = (NE_NAMEINFO*)((char*)pModule + hRsrc);
diff --git a/dlls/krnl386.exe16/snoop.c b/dlls/krnl386.exe16/snoop.c
index d5c528d3382..1504f8f7cd8 100644
--- a/dlls/krnl386.exe16/snoop.c
+++ b/dlls/krnl386.exe16/snoop.c
@@ -215,7 +215,7 @@ void WINAPI __wine_snoop_entry( CONTEXT *context )
    	dll=dll->next;
    }
    if (!dll) {
-		FIXME("entrypoint 0x%08x not found\n",entry);
+		FIXME("entrypoint 0x%08lx not found\n",entry);
    	return; /* oops */
    }
    while (*rets) {
@@ -246,7 +246,7 @@ void WINAPI __wine_snoop_entry( CONTEXT *context )
    context->SegCs = HIWORD(fun->origfun);

-	TRACE("\1CALL %s.%d: %s(", dll->name, ordinal, fun->name);
+	TRACE("\1CALL %s.%ld: %s(", dll->name, ordinal, fun->name);
    if (fun->nrofargs>0) {
    	max = fun->nrofargs;
    	if (max>16) max=16;
@@ -276,7 +276,7 @@ void WINAPI __wine_snoop_return( CONTEXT *context )
    }
    context->Eip = LOWORD(ret->origreturn);
    context->SegCs  = HIWORD(ret->origreturn);
-        TRACE("\1RET  %s.%d: %s(", ret->dll->name, ret->ordinal, ret->dll->funs[ret->ordinal].name);
+        TRACE("\1RET  %s.%ld: %s(", ret->dll->name, ret->ordinal, ret->dll->funs[ret->ordinal].name);
    if (ret->args) {
    	int	i,max;

diff --git a/dlls/krnl386.exe16/syslevel.c b/dlls/krnl386.exe16/syslevel.c
index cd93b9a0480..48507d97837 100644
--- a/dlls/krnl386.exe16/syslevel.c
+++ b/dlls/krnl386.exe16/syslevel.c
@@ -85,7 +85,7 @@ VOID WINAPI _EnterSysLevel(SYSLEVEL *lock)
     struct kernel_thread_data *thread_data = kernel_get_thread_data();
     int i;

-    TRACE("(%p, level %d): thread %x count before %d\n",
+    TRACE("(%p, level %d): thread %lx count before %ld\n",
           lock, lock->level, GetCurrentThreadId(), thread_data->sys_count[lock->level] );

for ( i = 3; i > lock->level; i-- )
@@ -100,7 +100,7 @@ VOID WINAPI _EnterSysLevel(SYSLEVEL *lock)
     thread_data->sys_count[lock->level]++;
     thread_data->sys_mutex[lock->level] = lock;

-    TRACE("(%p, level %d): thread %x count after  %d\n",
+    TRACE("(%p, level %d): thread %lx count after  %ld\n",
           lock, lock->level, GetCurrentThreadId(), thread_data->sys_count[lock->level] );

if (lock == &Win16Mutex) CallTo16_TebSelector = get_fs();
@@ -114,12 +114,12 @@ VOID WINAPI _LeaveSysLevel(SYSLEVEL *lock)
 {
     struct kernel_thread_data *thread_data = kernel_get_thread_data();

-    TRACE("(%p, level %d): thread %x count before %d\n",
+    TRACE("(%p, level %d): thread %lx count before %ld\n",
           lock, lock->level, GetCurrentThreadId(), thread_data->sys_count[lock->level] );

if ( thread_data->sys_count[lock->level] <= 0 || thread_data->sys_mutex[lock->level] != lock )
     {
-        ERR("(%p, level %d): Invalid state: count %d mutex %p.\n",
+        ERR("(%p, level %d): Invalid state: count %ld mutex %p.\n",
                     lock, lock->level, thread_data->sys_count[lock->level],
                     thread_data->sys_mutex[lock->level] );
     }
@@ -131,7 +131,7 @@ VOID WINAPI _LeaveSysLevel(SYSLEVEL *lock)

RtlLeaveCriticalSection( &lock->crst );

-    TRACE("(%p, level %d): thread %x count after  %d\n",
+    TRACE("(%p, level %d): thread %lx count after  %ld\n",
           lock, lock->level, GetCurrentThreadId(), thread_data->sys_count[lock->level] );
 }

diff --git a/dlls/krnl386.exe16/task.c b/dlls/krnl386.exe16/task.c
index 30a40328c86..54d7a4c64ee 100644
--- a/dlls/krnl386.exe16/task.c
+++ b/dlls/krnl386.exe16/task.c
@@ -680,7 +680,7 @@ BOOL16 WINAPI WaitEvent16( HTASK16 hTask )

if (pTask->flags & TDBF_WIN32)
     {
-        FIXME("called for Win32 thread (%04x)!\n", GetCurrentThreadId());
+        FIXME("called for Win32 thread (%04lx)!\n", GetCurrentThreadId());
         return TRUE;
     }

@@ -719,7 +719,7 @@ void WINAPI PostEvent16( HTASK16 hTask )

if (pTask->flags & TDBF_WIN32)
     {
-        FIXME("called for Win32 thread (%04x)!\n", (DWORD)pTask->teb->ClientId.UniqueThread );
+        FIXME("called for Win32 thread (%04lx)!\n", (DWORD)pTask->teb->ClientId.UniqueThread );
         return;
     }

@@ -881,7 +881,7 @@ FARPROC16 WINAPI MakeProcInstance16( FARPROC16 func, HANDLE16 hInstance )
     thunk = MapSL( thunkaddr );
     lfunc = MapSL( (SEGPTR)func );

-    TRACE("(%p,%04x): got thunk %08x\n", func, hInstance, thunkaddr );
+    TRACE("(%p,%04x): got thunk %08lx\n", func, hInstance, thunkaddr );
     if (((lfunc[0]==0x8c) && (lfunc[1]==0xd8)) || /* movw %ds, %ax */
     	((lfunc[0]==0x1e) && (lfunc[1]==0x58))    /* pushw %ds, popw %ax */
     ) {
diff --git a/dlls/krnl386.exe16/thunk.c b/dlls/krnl386.exe16/thunk.c
index 3ae61e1fe96..6b289eac65e 100644
--- a/dlls/krnl386.exe16/thunk.c
+++ b/dlls/krnl386.exe16/thunk.c
@@ -274,14 +274,14 @@ static LPVOID _loadthunk(LPCSTR module, LPCSTR func, LPCSTR module32,

if (TD32 && TD16->checksum != TD32->checksum)
     {
-        ERR("(%s, %s, %s): Wrong checksum %08x (should be %08x)\n",
+        ERR("(%s, %s, %s): Wrong checksum %08lx (should be %08lx)\n",
                    module, func, module32, TD16->checksum, TD32->checksum);
         return 0;
     }

if (!TD32 && checksum && checksum != *(LPDWORD)TD16)
     {
-        ERR("(%s, %s, %s): Wrong checksum %08x (should be %08x)\n",
+        ERR("(%s, %s, %s): Wrong checksum %08lx (should be %08lx)\n",
                    module, func, module32, *(LPDWORD)TD16, checksum);
         return 0;
     }
@@ -324,14 +324,14 @@ UINT WINAPI ThunkConnect32(
     {
         directionSL = TRUE;

-        TRACE("SL01 thunk %s (%p) <- %s (%s), Reason: %d\n",
+        TRACE("SL01 thunk %s (%p) <- %s (%s), Reason: %ld\n",
               module32, TD, module16, thunkfun16, dwReason);
     }
     else if (!strncmp(TD->magic, "LS01", 4))
     {
         directionSL = FALSE;

-        TRACE("LS01 thunk %s (%p) -> %s (%s), Reason: %d\n",
+        TRACE("LS01 thunk %s (%p) -> %s (%s), Reason: %ld\n",
               module32, TD, module16, thunkfun16, dwReason);
     }
     else
@@ -370,7 +370,7 @@ UINT WINAPI ThunkConnect32(
                 tdb->next = SL32->data->targetDB;   /* FIXME: not thread-safe! */
                 SL32->data->targetDB = tdb;

-                TRACE("Process %08x allocated TargetDB entry for ThunkDataSL %p\n",
+                TRACE("Process %08lx allocated TargetDB entry for ThunkDataSL %p\n",
                       GetCurrentProcessId(), SL32->data);
             }
             else
@@ -992,11 +992,11 @@ DWORD WINAPIV SSCall(
     DWORD i,ret;
     DWORD *args = ((DWORD *)&fun) + 1;

-    TRACE("(%d,0x%08x,%p,[",nr,flags,fun);
-    for (i = 0; i < nr/4; i++) TRACE("0x%08x,",args[i]);
+    TRACE("(%ld,0x%08lx,%p,[",nr,flags,fun);
+    for (i = 0; i < nr/4; i++) TRACE("0x%08lx,",args[i]);
     TRACE("])\n");
     ret = call_entry_point( fun, nr / sizeof(DWORD), args );
-    TRACE(" returning %d ...\n",ret);
+    TRACE(" returning %ld ...\n",ret);
     return ret;
 }

@@ -1079,7 +1079,7 @@ void WINAPI
 FreeSLCallback(
    DWORD x	/* [in] 16 bit callback (segmented pointer?) */
 ) {
-	FIXME("(0x%08x): stub\n",x);
+	FIXME("(0x%08lx): stub\n",x);
 }

/**********************************************************************
@@ -1234,7 +1234,7 @@ void WINAPI __regs_K32Thk1632Prolog( CONTEXT *context )
       WORD  stackSel  = SELECTOROF(frame32->frame16);
       DWORD stackBase = GetSelectorBase(stackSel);

-      TRACE("before SYSTHUNK hack: EBP: %08x ESP: %08x cur_stack: %04x:%04x\n",
+      TRACE("before SYSTHUNK hack: EBP: %08lx ESP: %08lx cur_stack: %04x:%04x\n",
             context->Ebp, context->Esp, CURRENT_SS, CURRENT_SP);

memset(frame16, '\0', sizeof(STACK16FRAME));
@@ -1248,7 +1248,7 @@ void WINAPI __regs_K32Thk1632Prolog( CONTEXT *context )
       context->Esp = (DWORD)stack32 + 4;
       context->Ebp = context->Esp + argSize;

-      TRACE("after  SYSTHUNK hack: EBP: %08x ESP: %08x cur_stack: %04x:%04x\n",
+      TRACE("after  SYSTHUNK hack: EBP: %08lx ESP: %08lx cur_stack: %04x:%04x\n",
             context->Ebp, context->Esp, CURRENT_SS, CURRENT_SP);
    }

@@ -1279,7 +1279,7 @@ void WINAPI __regs_K32Thk1632Epilog( CONTEXT *context )

DWORD nArgsPopped = context->Esp - (DWORD)stack32;

-      TRACE("before SYSTHUNK hack: EBP: %08x ESP: %08x cur_stack: %04x:%04x\n",
+      TRACE("before SYSTHUNK hack: EBP: %08lx ESP: %08lx cur_stack: %04x:%04x\n",
             context->Ebp, context->Esp, CURRENT_SS, CURRENT_SP);

kernel_get_thread_data()->stack = (SEGPTR)frame16->frame32;
@@ -1287,7 +1287,7 @@ void WINAPI __regs_K32Thk1632Epilog( CONTEXT *context )
       context->Esp = (DWORD)stack16 + nArgsPopped;
       context->Ebp = frame16->ebp;

-      TRACE("after  SYSTHUNK hack: EBP: %08x ESP: %08x cur_stack: %04x:%04x\n",
+      TRACE("after  SYSTHUNK hack: EBP: %08lx ESP: %08lx cur_stack: %04x:%04x\n",
             context->Ebp, context->Esp, CURRENT_SS, CURRENT_SP);
    }
 }
@@ -1336,14 +1336,14 @@ UINT WINAPI ThunkConnect16(
     {
         directionSL = TRUE;

-        TRACE("SL01 thunk %s (%p) -> %s (%s), Reason: %d\n",
+        TRACE("SL01 thunk %s (%p) -> %s (%s), Reason: %ld\n",
               module16, TD, module32, thunkfun32, dwReason);
     }
     else if (!strncmp(TD->magic, "LS01", 4))
     {
         directionSL = FALSE;

-        TRACE("LS01 thunk %s (%p) <- %s (%s), Reason: %d\n",
+        TRACE("LS01 thunk %s (%p) <- %s (%s), Reason: %ld\n",
               module16, TD, module32, thunkfun32, dwReason);
     }
     else
@@ -1510,7 +1510,7 @@ void WINAPI C16ThkSL01(CONTEXT *context)
         DWORD targetNr = LOWORD(context->Ecx) / 4;
         struct SLTargetDB *tdb;

-        TRACE("Process %08x calling target %d of ThunkDataSL %p\n",
+        TRACE("Process %08lx calling target %ld of ThunkDataSL %p\n",
               GetCurrentProcessId(), targetNr, td);

for (tdb = td->targetDB; tdb; tdb = tdb->next)
@@ -1531,7 +1531,7 @@ void WINAPI C16ThkSL01(CONTEXT *context)
         {
             context->Edx = tdb->targetTable[targetNr];

-            TRACE("Call target is %08x\n", context->Edx);
+            TRACE("Call target is %08lx\n", context->Edx);
         }
         else
         {
@@ -1542,7 +1542,7 @@ void WINAPI C16ThkSL01(CONTEXT *context)
             context->SegCs  = stack[3];
             context->Esp += td->apiDB[targetNr].nrArgBytes + 4;

-            ERR("Process %08x did not ThunkConnect32 %s to %s\n",
+            ERR("Process %08lx did not ThunkConnect32 %s to %s\n",
                 GetCurrentProcessId(), td->pszDll32, td->pszDll16);
         }
     }
@@ -2288,7 +2288,7 @@ void WINAPI HouseCleanLogicallyDeadHandles(void)
  */
 BOOL WINAPI _KERNEL32_100(HANDLE threadid,DWORD exitcode,DWORD x)
 {
-	FIXME("(%p,%d,0x%08x): stub\n",threadid,exitcode,x);
+	FIXME("(%p,%ld,0x%08lx): stub\n",threadid,exitcode,x);
    return TRUE;
 }

@@ -2301,7 +2301,7 @@ BOOL WINAPI _KERNEL32_100(HANDLE threadid,DWORD exitcode,DWORD x)
  */
 DWORD WINAPI _KERNEL32_99(DWORD x)
 {
-	FIXME("(0x%08x): stub\n",x);
+	FIXME("(0x%08lx): stub\n",x);
    return 1;
 }

@@ -2572,7 +2572,7 @@ static DWORD WOW_CallProc32W16( FARPROC proc32, DWORD nrofargs, DWORD *args )
     else ret = call_entry_point( proc32, nrofargs & ~CPEX_DEST_CDECL, args );
     RestoreThunkLock( mutex_count );

-    TRACE("returns %08x\n",ret);
+    TRACE("returns %08lx\n",ret);
     return ret;
 }

@@ -2584,7 +2584,7 @@ DWORD WINAPIV CallProc32W16( DWORD nrofargs, DWORD argconvmask, FARPROC proc32,
     DWORD args[32];
     unsigned int i;

-    TRACE("(%d,%d,%p args[",nrofargs,argconvmask,proc32);
+    TRACE("(%ld,%ld,%p args[",nrofargs,argconvmask,proc32);

for (i=0;i<nrofargs;i++)
     {
@@ -2593,14 +2593,14 @@ DWORD WINAPIV CallProc32W16( DWORD nrofargs, DWORD argconvmask, FARPROC proc32,
             SEGPTR ptr = VA_ARG16( valist, SEGPTR );
             /* pascal convention, have to reverse the arguments order */
             args[nrofargs - i - 1] = (DWORD)MapSL(ptr);
-            TRACE("%08x(%p),",ptr,MapSL(ptr));
+            TRACE("%08lx(%p),",ptr,MapSL(ptr));
         }
         else
         {
             DWORD arg = VA_ARG16( valist, DWORD );
             /* pascal convention, have to reverse the arguments order */
             args[nrofargs - i - 1] = arg;
-            TRACE("%d,", arg);
+            TRACE("%ld,", arg);
         }
     }
     TRACE("])\n");
@@ -2619,7 +2619,7 @@ DWORD WINAPIV CallProcEx32W16( DWORD nrofargs, DWORD argconvmask, FARPROC proc32
     DWORD args[32];
     unsigned int i, count = min( 32, nrofargs & ~CPEX_DEST_CDECL );

-    TRACE("(%s,%d,%d,%p args[", nrofargs & CPEX_DEST_CDECL ? "cdecl": "stdcall",
+    TRACE("(%s,%ld,%ld,%p args[", nrofargs & CPEX_DEST_CDECL ? "cdecl": "stdcall",
           nrofargs & ~CPEX_DEST_CDECL, argconvmask, proc32);

for (i = 0; i < count; i++)
@@ -2628,13 +2628,13 @@ DWORD WINAPIV CallProcEx32W16( DWORD nrofargs, DWORD argconvmask, FARPROC proc32
         {
             SEGPTR ptr = VA_ARG16( valist, SEGPTR );
             args[i] = (DWORD)MapSL(ptr);
-            TRACE("%08x(%p),",ptr,MapSL(ptr));
+            TRACE("%08lx(%p),",ptr,MapSL(ptr));
         }
         else
         {
             DWORD arg = VA_ARG16( valist, DWORD );
             args[i] = arg;
-            TRACE("%d,", arg);
+            TRACE("%ld,", arg);
         }
     }
     TRACE("])\n");
@@ -2660,6 +2660,6 @@ DWORD WINAPIV WOW16Call(WORD x, WORD y, WORD z, VA_LIST16 args)
         }
         calladdr = VA_ARG16(args,DWORD);
         stack16_pop( 3*sizeof(WORD) + x + sizeof(DWORD) );
-        FIXME(") calling address was 0x%08x\n",calladdr);
+        FIXME(") calling address was 0x%08lx\n",calladdr);
         return 0;
 }
diff --git a/dlls/krnl386.exe16/utthunk.c b/dlls/krnl386.exe16/utthunk.c
index 5e37abee0e8..7aa1cab4561 100644
--- a/dlls/krnl386.exe16/utthunk.c
+++ b/dlls/krnl386.exe16/utthunk.c
@@ -328,6 +328,6 @@ VOID WINAPI UTUnRegister( HMODULE hModule )
  */
 WORD WINAPI UTInit16( DWORD x1, DWORD x2, DWORD x3, DWORD x4 )
 {
-    FIXME("(%08x, %08x, %08x, %08x): stub\n", x1, x2, x3, x4 );
+    FIXME("(%08lx, %08lx, %08lx, %08lx): stub\n", x1, x2, x3, x4 );
     return 0;
 }
diff --git a/dlls/krnl386.exe16/vxd.c b/dlls/krnl386.exe16/vxd.c
index 5d280fb2fda..c9ce9729ec5 100644
--- a/dlls/krnl386.exe16/vxd.c
+++ b/dlls/krnl386.exe16/vxd.c
@@ -252,7 +252,7 @@ void WINAPI DECLSPEC_HIDDEN __regs_VxDCall( CONTEXT *context )
     if (proc) context->Eax = proc( service, context );
     else
     {
-        FIXME( "Unknown/unimplemented VxD (%08x)\n", service);
+        FIXME( "Unknown/unimplemented VxD (%08lx)\n", service);
         context->Eax = 0xffffffff; /* FIXME */
     }
 }
@@ -414,7 +414,7 @@ void WINAPI __wine_vxd_vxdloader( CONTEXT *context )
    break;

case 0x0001: /* load device */
-	FIXME("load device %04x:%04x (%s)\n",
+	FIXME("load device %04lx:%04x (%s)\n",
          context->SegDs, DX_reg(context),
          debugstr_a(MapSL(MAKESEGPTR(context->SegDs, DX_reg(context)))));
    SET_AX( context, 0x0000 );
@@ -424,7 +424,7 @@ void WINAPI __wine_vxd_vxdloader( CONTEXT *context )
    break;

case 0x0002: /* unload device */
-	FIXME("unload device (%08x)\n", context->Ebx);
+	FIXME("unload device (%08lx)\n", context->Ebx);
    SET_AX( context, 0x0000 );
    RESET_CFLAG(context);
    break;
@@ -518,7 +518,7 @@ void WINAPI __wine_vxd_shell( CONTEXT *context )
    break;

case 0x0106:   /* install timeout callback */
-	TRACE("VxD Shell: ignoring shell callback (%d sec.)\n", context->Ebx);
+	TRACE("VxD Shell: ignoring shell callback (%ld sec.)\n", context->Ebx);
    SET_CFLAG(context);
    break;

@@ -887,7 +887,7 @@ void WINAPI __wine_vxd_win32s( CONTEXT *context )
          * Output:  EAX: 0 if OK
          */

-        TRACE("[0001] EBX=%x ECX=%x EDX=%x ESI=%x EDI=%x\n",
+        TRACE("[0001] EBX=%lx ECX=%lx EDX=%lx ESI=%lx EDI=%lx\n",
                    context->Ebx, context->Ecx, context->Edx,
                    context->Esi, context->Edi);

@@ -910,7 +910,7 @@ void WINAPI __wine_vxd_win32s( CONTEXT *context )
          * Output:  EAX: Size of area changed
          */

-        TRACE("[0002] EBX=%x ECX=%x EDX=%x\n",
+        TRACE("[0002] EBX=%lx ECX=%lx EDX=%lx\n",
                    context->Ebx, context->Ecx, context->Edx);

/* FIXME */
@@ -928,7 +928,7 @@ void WINAPI __wine_vxd_win32s( CONTEXT *context )
          *               Bit 1: Read-Write if set, Read-Only if clear
          */

-        TRACE("[0003] EDX=%x\n", context->Edx);
+        TRACE("[0003] EDX=%lx\n", context->Edx);

/* FIXME */

@@ -999,7 +999,7 @@ void WINAPI __wine_vxd_win32s( CONTEXT *context )
                 LPBYTE addr = module->baseAddr + pe_seg->VirtualAddress;

TRACE("MapModule: "
-                           "Section %d at %08x from %08x len %08x\n",
+                           "Section %d at %08lx from %08lx len %08lx\n",
                            i, (DWORD)addr, off, len);

if (   _llseek(image, off, SEEK_SET) != off
@@ -1019,7 +1019,7 @@ void WINAPI __wine_vxd_win32s( CONTEXT *context )
             IMAGE_BASE_RELOCATION *r = (IMAGE_BASE_RELOCATION *)
                 (dir->Size? module->baseAddr + dir->VirtualAddress : 0);

-            TRACE("MapModule: Reloc delta %08x\n", module->relocDelta);
+            TRACE("MapModule: Reloc delta %08lx\n", module->relocDelta);

while (r && r->VirtualAddress)
             {
@@ -1027,7 +1027,7 @@ void WINAPI __wine_vxd_win32s( CONTEXT *context )
                 WORD *TypeOffset = (WORD *)(r + 1);
                 unsigned int count = (r->SizeOfBlock - sizeof(*r)) / sizeof(*TypeOffset);

-                TRACE("MapModule: %d relocations for page %08x\n",
+                TRACE("MapModule: %d relocations for page %08lx\n",
                            count, (DWORD)page);

for(i = 0; i < count; i++)
@@ -1070,7 +1070,7 @@ void WINAPI __wine_vxd_win32s( CONTEXT *context )
          * Output:  EAX: 1 if OK
          */

-        TRACE("UnMapModule: %x\n", W32S_APP2WINE(context->Edx));
+        TRACE("UnMapModule: %lx\n", W32S_APP2WINE(context->Edx));

/* As we didn't map anything, there's nothing to unmap ... */

@@ -1101,12 +1101,12 @@ void WINAPI __wine_vxd_win32s( CONTEXT *context )
         DWORD  prot   = stack[4];
         DWORD  result;

-        TRACE("VirtualAlloc(%x, %x, %x, %x, %x)\n",
+        TRACE("VirtualAlloc(%lx, %lx, %lx, %lx, %lx)\n",
                    (DWORD)retv, (DWORD)base, size, type, prot);

if (type & 0x80000000)
         {
-            WARN("VirtualAlloc: strange type %x\n", type);
+            WARN("VirtualAlloc: strange type %lx\n", type);
             type &= 0x7fffffff;
         }

@@ -1149,7 +1149,7 @@ void WINAPI __wine_vxd_win32s( CONTEXT *context )
         DWORD  type   = stack[3];
         DWORD  result;

-        TRACE("VirtualFree(%x, %x, %x, %x)\n",
+        TRACE("VirtualFree(%lx, %lx, %lx, %lx)\n",
                    (DWORD)retv, (DWORD)base, size, type);

result = VirtualFree(base, size, type);
@@ -1187,7 +1187,7 @@ void WINAPI __wine_vxd_win32s( CONTEXT *context )
         DWORD *old_prot = (DWORD *)W32S_APP2WINE(stack[4]);
         DWORD  result;

-        TRACE("VirtualProtect(%x, %x, %x, %x, %x)\n",
+        TRACE("VirtualProtect(%lx, %lx, %lx, %lx, %lx)\n",
                    (DWORD)retv, (DWORD)base, size, new_prot, (DWORD)old_prot);

result = VirtualProtect(base, size, new_prot, old_prot);
@@ -1224,7 +1224,7 @@ void WINAPI __wine_vxd_win32s( CONTEXT *context )
         DWORD  len    = stack[3];
         DWORD  result;

-        TRACE("VirtualQuery(%x, %x, %x, %x)\n",
+        TRACE("VirtualQuery(%lx, %lx, %lx, %lx)\n",
                    (DWORD)retv, (DWORD)base, (DWORD)info, len);

result = VirtualQuery(base, info, len);
@@ -1244,7 +1244,7 @@ void WINAPI __wine_vxd_win32s( CONTEXT *context )
          * Output:  EAX: NtStatus
          */

-        TRACE("[000a] ECX=%x EDX=%x\n",
+        TRACE("[000a] ECX=%lx EDX=%lx\n",
                    context->Ecx, context->Edx);

/* FIXME */
@@ -1260,7 +1260,7 @@ void WINAPI __wine_vxd_win32s( CONTEXT *context )
          * Output:  EAX: NtStatus
          */

-        TRACE("[000b] ECX=%x\n", context->Ecx);
+        TRACE("[000b] ECX=%lx\n", context->Ecx);

/* FIXME */

@@ -1275,7 +1275,7 @@ void WINAPI __wine_vxd_win32s( CONTEXT *context )
          * Output:  EDX: Previous Debug Flags
          */

-        FIXME("[000c] EDX=%x\n", context->Edx);
+        FIXME("[000c] EDX=%lx\n", context->Edx);

/* FIXME */

@@ -1312,7 +1312,7 @@ void WINAPI __wine_vxd_win32s( CONTEXT *context )
         HANDLE result = INVALID_HANDLE_VALUE;
         char name[128];

-        TRACE("NtCreateSection(%x, %x, %x, %x, %x, %x, %x, %x)\n",
+        TRACE("NtCreateSection(%lx, %lx, %lx, %lx, %lx, %lx, %lx, %lx)\n",
                    (DWORD)retv, flags1, atom, (DWORD)size, protect, flags2,
                    (DWORD)hFile, psp);

@@ -1329,7 +1329,7 @@ void WINAPI __wine_vxd_win32s( CONTEXT *context )
         if (result == INVALID_HANDLE_VALUE)
             WARN("NtCreateSection: failed!\n");
         else
-            TRACE("NtCreateSection: returned %x\n", (DWORD)result);
+            TRACE("NtCreateSection: returned %lx\n", (DWORD)result);

if (result != INVALID_HANDLE_VALUE)
             *retv            = result,
@@ -1360,7 +1360,7 @@ void WINAPI __wine_vxd_win32s( CONTEXT *context )
         HANDLE result = INVALID_HANDLE_VALUE;
         char name[128];

-        TRACE("NtOpenSection(%x, %x, %x)\n",
+        TRACE("NtOpenSection(%lx, %lx, %lx)\n",
                    (DWORD)retv, protect, atom);

if (atom && GlobalGetAtomNameA(atom, name, sizeof(name)))
@@ -1373,7 +1373,7 @@ void WINAPI __wine_vxd_win32s( CONTEXT *context )
         if (result == INVALID_HANDLE_VALUE)
             WARN("NtOpenSection: failed!\n");
         else
-            TRACE("NtOpenSection: returned %x\n", (DWORD)result);
+            TRACE("NtOpenSection: returned %lx\n", (DWORD)result);

if (result != INVALID_HANDLE_VALUE)
             *retv            = result,
@@ -1399,7 +1399,7 @@ void WINAPI __wine_vxd_win32s( CONTEXT *context )
         HANDLE handle   = (HANDLE)stack[0];
         DWORD *id       = (DWORD *)W32S_APP2WINE(stack[1]);

-        TRACE("NtCloseSection(%x, %x)\n", (DWORD)handle, (DWORD)id);
+        TRACE("NtCloseSection(%lx, %lx)\n", (DWORD)handle, (DWORD)id);

CloseHandle(handle);
         if (id) *id = 0; /* FIXME */
@@ -1422,7 +1422,7 @@ void WINAPI __wine_vxd_win32s( CONTEXT *context )
         HANDLE handle   = (HANDLE)stack[0];
         HANDLE new_handle;

-        TRACE("NtDupSection(%x)\n", (DWORD)handle);
+        TRACE("NtDupSection(%lx)\n", (DWORD)handle);

DuplicateHandle( GetCurrentProcess(), handle,
                          GetCurrentProcess(), &new_handle,
@@ -1478,12 +1478,12 @@ void WINAPI __wine_vxd_win32s( CONTEXT *context )
         }

TRACE("NtMapViewOfSection"
-                   "(%x, %x, %x, %x, %x, %x, %x, %x, %x, %x)\n",
+                   "(%lx, %lx, %lx, %lx, %lx, %lx, %lx, %lx, %lx, %lx)\n",
                    (DWORD)SectionHandle, ProcessHandle, (DWORD)BaseAddress,
                    ZeroBits, CommitSize, (DWORD)SectionOffset, (DWORD)ViewSize,
                    InheritDisposition, AllocationType, Protect);
         TRACE("NtMapViewOfSection: "
-                   "base=%x, offset=%x, size=%x, access=%x\n",
+                   "base=%lx, offset=%lx, size=%lx, access=%lx\n",
                    (DWORD)address, SectionOffset? SectionOffset->u.LowPart : 0,
                    ViewSize? *ViewSize : 0, access);

@@ -1492,7 +1492,7 @@ void WINAPI __wine_vxd_win32s( CONTEXT *context )
                             SectionOffset? SectionOffset->u.LowPart  : 0,
                             ViewSize? *ViewSize : 0, address);

-        TRACE("NtMapViewOfSection: result=%x\n", result);
+        TRACE("NtMapViewOfSection: result=%lx\n", result);

if (W32S_WINE2APP(result))
         {
@@ -1519,7 +1519,7 @@ void WINAPI __wine_vxd_win32s( CONTEXT *context )
         DWORD  ProcessHandle  = stack[0]; /* ignored */
         LPBYTE BaseAddress    = (LPBYTE)W32S_APP2WINE(stack[1]);

-        TRACE("NtUnmapViewOfSection(%x, %x)\n",
+        TRACE("NtUnmapViewOfSection(%lx, %lx)\n",
                    ProcessHandle, (DWORD)BaseAddress);

UnmapViewOfFile(BaseAddress);
@@ -1550,10 +1550,10 @@ void WINAPI __wine_vxd_win32s( CONTEXT *context )
         LPBYTE address = (LPBYTE)(BaseAddress? W32S_APP2WINE(*BaseAddress) : 0);
         DWORD  size    = ViewSize? *ViewSize : 0;

-        TRACE("NtFlushVirtualMemory(%x, %x, %x, %x)\n",
+        TRACE("NtFlushVirtualMemory(%lx, %lx, %lx, %lx)\n",
                    ProcessHandle, (DWORD)BaseAddress, (DWORD)ViewSize,
                    (DWORD)unknown);
-        TRACE("NtFlushVirtualMemory: base=%x, size=%x\n",
+        TRACE("NtFlushVirtualMemory: base=%lx, size=%lx\n",
                    (DWORD)address, size);

FlushViewOfFile(address, size);
@@ -1574,7 +1574,7 @@ void WINAPI __wine_vxd_win32s( CONTEXT *context )
          * Output:  None
          */

-        FIXME("[0014] ECX=%x EDX=%x\n",
+        FIXME("[0014] ECX=%lx EDX=%lx\n",
                    context->Ecx, context->Edx);

/* FIXME */
@@ -1588,7 +1588,7 @@ void WINAPI __wine_vxd_win32s( CONTEXT *context )
          * Output:  None
          */

-        TRACE("[0015] EDX=%x\n", context->Edx);
+        TRACE("[0015] EDX=%lx\n", context->Edx);

/* We don't care, as we always have a coprocessor anyway */
         break;
@@ -1628,7 +1628,7 @@ void WINAPI __wine_vxd_win32s( CONTEXT *context )
          * Output:  None
          */

-        FIXME("[0017] EBX=%x CX=%x\n",
+        FIXME("[0017] EBX=%lx CX=%x\n",
                    context->Ebx, CX_reg(context));

/* FIXME */
@@ -1654,7 +1654,7 @@ void WINAPI __wine_vxd_win32s( CONTEXT *context )
         DWORD  size   = stack[2];
         DWORD  result;

-        TRACE("VirtualLock(%x, %x, %x)\n",
+        TRACE("VirtualLock(%lx, %lx, %lx)\n",
                    (DWORD)retv, (DWORD)base, size);

result = VirtualLock(base, size);
@@ -1688,7 +1688,7 @@ void WINAPI __wine_vxd_win32s( CONTEXT *context )
         DWORD  size   = stack[2];
         DWORD  result;

-        TRACE("VirtualUnlock(%x, %x, %x)\n",
+        TRACE("VirtualUnlock(%lx, %lx, %lx)\n",
                    (DWORD)retv, (DWORD)base, size);

result = VirtualUnlock(base, size);
@@ -1748,7 +1748,7 @@ void WINAPI __wine_vxd_win32s( CONTEXT *context )
         struct Win32sMemoryInfo *info =
                        (struct Win32sMemoryInfo *)W32S_APP2WINE(context->Esi);

-        FIXME("KGlobalMemStat(%x)\n", (DWORD)info);
+        FIXME("KGlobalMemStat(%lx)\n", (DWORD)info);

/* FIXME */
     }
@@ -1762,7 +1762,7 @@ void WINAPI __wine_vxd_win32s( CONTEXT *context )
          * Output:  None
          */

-        TRACE("[001c] ECX=%x\n", context->Ecx);
+        TRACE("[001c] ECX=%lx\n", context->Ecx);

/* FIXME */
         break;
@@ -1788,12 +1788,12 @@ void WINAPI __wine_vxd_win32s( CONTEXT *context )
         DWORD  prot   = stack[3];
         DWORD  result;

-        TRACE("VirtualAlloc16(%x, %x, %x, %x)\n",
+        TRACE("VirtualAlloc16(%lx, %lx, %lx, %lx)\n",
                    (DWORD)base, size, type, prot);

if (type & 0x80000000)
         {
-            WARN("VirtualAlloc16: strange type %x\n", type);
+            WARN("VirtualAlloc16: strange type %lx\n", type);
             type &= 0x7fffffff;
         }

@@ -1805,7 +1805,7 @@ void WINAPI __wine_vxd_win32s( CONTEXT *context )
         else
             context->Edx = 0,
             context->Eax = STATUS_NO_MEMORY;  /* FIXME */
-	TRACE("VirtualAlloc16: returning base %x\n", context->Edx);
+	TRACE("VirtualAlloc16: returning base %lx\n", context->Edx);
     }
     break;

@@ -1828,7 +1828,7 @@ void WINAPI __wine_vxd_win32s( CONTEXT *context )
         DWORD  type   = stack[2];
         DWORD  result;

-        TRACE("VirtualFree16(%x, %x, %x)\n",
+        TRACE("VirtualFree16(%lx, %lx, %lx)\n",
                    (DWORD)base, size, type);

result = VirtualFree(base, size, type);
@@ -1856,7 +1856,7 @@ void WINAPI __wine_vxd_win32s( CONTEXT *context )
         DWORD *ptr = (DWORD *)W32S_APP2WINE(context->Ecx);
         BOOL set = context->Edx;

-        TRACE("FWorkingSetSize(%x, %x)\n", (DWORD)ptr, (DWORD)set);
+        TRACE("FWorkingSetSize(%lx, %lx)\n", (DWORD)ptr, (DWORD)set);

if (set)
             /* We do it differently ... */;
diff --git a/dlls/krnl386.exe16/wowthunk.c b/dlls/krnl386.exe16/wowthunk.c
index 8cc1fa248e6..22471d6d612 100644
--- a/dlls/krnl386.exe16/wowthunk.c
+++ b/dlls/krnl386.exe16/wowthunk.c
@@ -445,7 +445,7 @@ BOOL WINAPI K32WOWCallback16Ex( DWORD vpfn16, DWORD dwFlags,
             DWORD count = cbArgs / sizeof(WORD);
             WORD * wstack = (WORD *)stack;

-            TRACE_(relay)( "\1CallTo16(func=%04x:%04x", context->SegCs, LOWORD(context->Eip) );
+            TRACE_(relay)( "\1CallTo16(func=%04lx:%04x", context->SegCs, LOWORD(context->Eip) );
             while (count) TRACE_(relay)( ",%04x", wstack[--count] );
             TRACE_(relay)( ") ss:sp=%04x:%04x ax=%04x bx=%04x cx=%04x dx=%04x si=%04x di=%04x bp=%04x ds=%04x es=%04x\n",
                            CURRENT_SS, CURRENT_SP,
@@ -507,7 +507,7 @@ BOOL WINAPI K32WOWCallback16Ex( DWORD vpfn16, DWORD dwFlags,

if (TRACE_ON(relay))
         {
-            TRACE_(relay)( "\1RetFrom16() ss:sp=%04x:%04x retval=%08x\n", CURRENT_SS, CURRENT_SP, ret );
+            TRACE_(relay)( "\1RetFrom16() ss:sp=%04x:%04x retval=%08lx\n", CURRENT_SS, CURRENT_SP, ret );
             SYSLEVEL_CheckNotLevel( 2 );
         }
     }

[PATCH 20/23] dlls/ktmw32: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech

---
 dlls/ktmw32/Makefile.in   |    1 -
 dlls/ktmw32/ktmw32_main.c |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/dlls/ktmw32/Makefile.in b/dlls/ktmw32/Makefile.in
index 73f80aef0cf..b0517f09193 100644
--- a/dlls/ktmw32/Makefile.in
+++ b/dlls/ktmw32/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = ktmw32.dll

C_SRCS = \
diff --git a/dlls/ktmw32/ktmw32_main.c b/dlls/ktmw32/ktmw32_main.c
index 462d122a4e5..710683aff36 100644
--- a/dlls/ktmw32/ktmw32_main.c
+++ b/dlls/ktmw32/ktmw32_main.c
@@ -43,7 +43,7 @@ HANDLE WINAPI CreateTransaction(LPSECURITY_ATTRIBUTES pattr, LPGUID pguid, DWORD
                                 DWORD level, DWORD flags, DWORD timeout, LPWSTR description)
 {

-    FIXME("(%p %p 0x%x 0x%x 0x%x, %u, %s): stub\n",
+    FIXME("(%p %p 0x%lx 0x%lx 0x%lx, %lu, %s): stub\n",
             pattr, pguid, options, level, flags, timeout, debugstr_w(description));

return (HANDLE) 1;

[PATCH 21/23] dlls/l3codeca.acm: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech

---
 dlls/l3codeca.acm/Makefile.in |    1 -
 dlls/l3codeca.acm/mpegl3.c    |   12 ++++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/dlls/l3codeca.acm/Makefile.in b/dlls/l3codeca.acm/Makefile.in
index 781dfb27ddd..451794b2624 100644
--- a/dlls/l3codeca.acm/Makefile.in
+++ b/dlls/l3codeca.acm/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = l3codeca.acm
 IMPORTS   = $(MPG123_PE_LIBS) winmm user32 kernelbase
 EXTRAINCL = $(MPG123_PE_CFLAGS)
diff --git a/dlls/l3codeca.acm/mpegl3.c b/dlls/l3codeca.acm/mpegl3.c
index 336e706bb83..b5b0f8029e5 100644
--- a/dlls/l3codeca.acm/mpegl3.c
+++ b/dlls/l3codeca.acm/mpegl3.c
@@ -292,7 +292,7 @@ static	LRESULT	MPEG3_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery)
    }
    break;
     default:
-	WARN("Unsupported query %08x\n", dwQuery);
+	WARN("Unsupported query %08lx\n", dwQuery);
    return MMSYSERR_NOTSUPPORTED;
     }

@@ -354,12 +354,12 @@ static	LRESULT	MPEG3_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery)
             WARN("Encoding to MPEG is not supported\n");
             return ACMERR_NOTPOSSIBLE;
    default:
-            WARN("Unsupported tag %08x\n", afd->dwFormatTag);
+            WARN("Unsupported tag %08lx\n", afd->dwFormatTag);
        return MMSYSERR_INVALPARAM;
    }
    break;
     default:
-	WARN("Unsupported query %08x\n", dwQuery);
+	WARN("Unsupported query %08lx\n", dwQuery);
    return MMSYSERR_NOTSUPPORTED;
     }
     afd->fdwSupport = ACMDRIVERDETAILS_SUPPORTF_CODEC;
@@ -488,7 +488,7 @@ static	LRESULT MPEG3_StreamSize(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMSIZE ad
    }
    break;
     default:
-	WARN("Unsupported query %08x\n", adss->fdwSize);
+	WARN("Unsupported query %08lx\n", adss->fdwSize);
    return MMSYSERR_NOTSUPPORTED;
     }
     return MMSYSERR_NOERROR;
@@ -509,7 +509,7 @@ static LRESULT MPEG3_StreamConvert(ACMDRVSTREAMINSTANCE *instance, ACMDRVSTREAMH
      ACM_STREAMCONVERTF_END|
      ACM_STREAMCONVERTF_START))
     {
-	FIXME("Unsupported fdwConvert (%08x), ignoring it\n", adsh->fdwConvert);
+	FIXME("Unsupported fdwConvert (%08lx), ignoring it\n", adsh->fdwConvert);
     }
     /* ACM_STREAMCONVERTF_BLOCKALIGN
      *	currently all conversions are block aligned, so do nothing for this flag
@@ -536,7 +536,7 @@ static LRESULT MPEG3_StreamConvert(ACMDRVSTREAMINSTANCE *instance, ACMDRVSTREAMH
 LRESULT CALLBACK MPEG3_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg,
    				 LPARAM dwParam1, LPARAM dwParam2)
 {
-    TRACE("(%08lx %p %04x %08lx %08lx);\n",
+    TRACE("(%08Ix %p %04x %08Ix %08Ix);\n",
      dwDevID, hDriv, wMsg, dwParam1, dwParam2);

switch (wMsg)

[PATCH 22/23] dlls/localspl: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech

---
 dlls/localspl/Makefile.in |    1 
 dlls/localspl/localmon.c  |   48 ++++++++++-----------
 dlls/localspl/provider.c  |  104 +++++++++++++++++++++++----------------------
 3 files changed, 76 insertions(+), 77 deletions(-)

diff --git a/dlls/localspl/Makefile.in b/dlls/localspl/Makefile.in
index e3f68084d10..ab1d5a79d64 100644
--- a/dlls/localspl/Makefile.in
+++ b/dlls/localspl/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = localspl.dll
 IMPORTS   = spoolss user32 advapi32

diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c
index f49c40b1701..c0e5b56baae 100644
--- a/dlls/localspl/localmon.c
+++ b/dlls/localspl/localmon.c
@@ -88,7 +88,7 @@ HINSTANCE localspl_instance;
  */
 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
-    TRACE("(%p, %d, %p)\n",hinstDLL, fdwReason, lpvReserved);
+    TRACE("(%p, %ld, %p)\n",hinstDLL, fdwReason, lpvReserved);

switch(fdwReason)
     {
@@ -127,7 +127,7 @@ static BOOL does_port_exist(LPCWSTR myname)
         for (id = 0; id < returned; id++)
         {
             if (lstrcmpiW(myname, pi[id].pName) == 0) {
-                TRACE("(%u) found %s\n", id, debugstr_w(pi[id].pName));
+                TRACE("(%lu) found %s\n", id, debugstr_w(pi[id].pName));
                 heap_free(pi);
                 return TRUE;
             }
@@ -166,7 +166,7 @@ static DWORD get_ports_from_reg(DWORD level, LPBYTE pPorts, DWORD cbBuf, LPDWORD
     DWORD   entrysize;
     DWORD   id = 0;

-    TRACE("(%d, %p, %d, %p)\n", level, pPorts, cbBuf, lpreturned);
+    TRACE("(%ld, %p, %ld, %p)\n", level, pPorts, cbBuf, lpreturned);

entrysize = (level == 1) ? sizeof(PORT_INFO_1W) : sizeof(PORT_INFO_2W);

@@ -210,7 +210,7 @@ static DWORD get_ports_from_reg(DWORD level, LPBYTE pPorts, DWORD cbBuf, LPDWORD
                 if (pPorts && (cbBuf >= needed)){
                     out = (LPPORT_INFO_2W) pPorts;
                     pPorts += entrysize;
-                    TRACE("%p: writing PORT_INFO_%dW #%d (%s)\n", out, level, numentries, debugstr_w(portname));
+                    TRACE("%p: writing PORT_INFO_%ldW #%ld (%s)\n", out, level, numentries, debugstr_w(portname));
                     out->pPortName = ptr;
                     lstrcpyW(ptr, portname);            /* Name of the Port */
                     ptr += (len + 1);
@@ -234,13 +234,13 @@ static DWORD get_ports_from_reg(DWORD level, LPBYTE pPorts, DWORD cbBuf, LPDWORD
     }
     else
     {
-        ERR("failed with %d for %s\n", res, debugstr_w(WinNT_CV_PortsW));
+        ERR("failed with %ld for %s\n", res, debugstr_w(WinNT_CV_PortsW));
         SetLastError(res);
     }

getports_cleanup:
     *lpreturned = numentries;
-    TRACE("need %d byte for %d entries (%d)\n", needed, numentries, GetLastError());
+    TRACE("need %ld byte for %ld entries (%ld)\n", needed, numentries, GetLastError());
     return needed;
 }

@@ -316,7 +316,7 @@ static DWORD get_type_from_local_name(LPCWSTR nameW)
         while ((myname == NULL) && (id < numentries))
         {
             if (lstrcmpiW(nameW, pi[id].pName) == 0) {
-                TRACE("(%u) found %s\n", id, debugstr_w(pi[id].pName));
+                TRACE("(%lu) found %s\n", id, debugstr_w(pi[id].pName));
                 myname = pi[id].pName;
             }
             id++;
@@ -355,7 +355,7 @@ static BOOL WINAPI localmon_AddPortExW(LPWSTR pName, DWORD level, LPBYTE pBuffer
     DWORD res;

pi = (PORT_INFO_1W *) pBuffer;
-    TRACE("(%s, %d, %p, %s) => %s\n", debugstr_w(pName), level, pBuffer,
+    TRACE("(%s, %ld, %p, %s) => %s\n", debugstr_w(pName), level, pBuffer,
             debugstr_w(pMonitorName), debugstr_w(pi ? pi->pName : NULL));

@@ -382,7 +382,7 @@ static BOOL WINAPI localmon_AddPortExW(LPWSTR pName, DWORD level, LPBYTE pBuffer
         RegCloseKey(hroot);
     }
     if (res != ERROR_SUCCESS) SetLastError(ERROR_INVALID_PARAMETER);
-    TRACE("=> %u with %u\n", (res == ERROR_SUCCESS), GetLastError());
+    TRACE("=> %u with %lu\n", (res == ERROR_SUCCESS), GetLastError());
     return (res == ERROR_SUCCESS);
 }

@@ -444,7 +444,7 @@ static BOOL WINAPI localmon_EnumPortsW(LPWSTR pName, DWORD level, LPBYTE pPorts,
     DWORD   needed;
     DWORD   numentries;

-    TRACE("(%s, %d, %p, %d, %p, %p)\n",
+    TRACE("(%s, %ld, %p, %ld, %p, %p)\n",
           debugstr_w(pName), level, pPorts, cbBuf, pcbNeeded, pcReturned);

numentries = 0;
@@ -464,7 +464,7 @@ static BOOL WINAPI localmon_EnumPortsW(LPWSTR pName, DWORD level, LPBYTE pPorts,
 cleanup:
     if (pcbNeeded)  *pcbNeeded = needed;

-    TRACE("returning %d with %d (%d byte for %d entries)\n", 
+    TRACE("returning %d with %ld (%ld byte for %ld entries)\n", 
             res, GetLastError(), needed, numentries);

return (res);
@@ -576,11 +576,11 @@ static DWORD WINAPI localmon_XcvDataPort(HANDLE hXcv, LPCWSTR pszDataName, PBYTE
     DWORD   needed;
     HKEY    hroot;

-    TRACE("(%p, %s, %p, %d, %p, %d, %p)\n", hXcv, debugstr_w(pszDataName),
+    TRACE("(%p, %s, %p, %ld, %p, %ld, %p)\n", hXcv, debugstr_w(pszDataName),
           pInputData, cbInputData, pOutputData, cbOutputData, pcbOutputNeeded);

if (!lstrcmpW(pszDataName, L"AddPort")) {
-        TRACE("InputData (%d): %s\n", cbInputData, debugstr_w( (LPWSTR) pInputData));
+        TRACE("InputData (%ld): %s\n", cbInputData, debugstr_w( (LPWSTR) pInputData));
         res = RegOpenKeyW(HKEY_LOCAL_MACHINE, WinNT_CV_PortsW, &hroot);
         if (res == ERROR_SUCCESS) {
             if (does_port_exist((LPWSTR) pInputData)) {
@@ -591,13 +591,13 @@ static DWORD WINAPI localmon_XcvDataPort(HANDLE hXcv, LPCWSTR pszDataName, PBYTE
             res = RegSetValueExW(hroot, (LPWSTR)pInputData, 0, REG_SZ, (const BYTE*)L"", sizeof(L""));
             RegCloseKey(hroot);
         }
-        TRACE("=> %u\n", res);
+        TRACE("=> %lu\n", res);
         return res;
     }

if (!lstrcmpW(pszDataName, L"ConfigureLPTPortCommandOK")) {
-        TRACE("InputData (%d): %s\n", cbInputData, debugstr_w( (LPWSTR) pInputData));
+        TRACE("InputData (%ld): %s\n", cbInputData, debugstr_w( (LPWSTR) pInputData));
         res = RegCreateKeyW(HKEY_LOCAL_MACHINE, WinNT_CV_WindowsW, &hroot);
         if (res == ERROR_SUCCESS) {
             res = RegSetValueExW(hroot, L"TransmissionRetryTimeout", 0, REG_SZ, pInputData, cbInputData);
@@ -607,22 +607,22 @@ static DWORD WINAPI localmon_XcvDataPort(HANDLE hXcv, LPCWSTR pszDataName, PBYTE
     }

if (!lstrcmpW(pszDataName, L"DeletePort")) {
-        TRACE("InputData (%d): %s\n", cbInputData, debugstr_w( (LPWSTR) pInputData));
+        TRACE("InputData (%ld): %s\n", cbInputData, debugstr_w( (LPWSTR) pInputData));
         res = RegOpenKeyW(HKEY_LOCAL_MACHINE, WinNT_CV_PortsW, &hroot);
         if (res == ERROR_SUCCESS) {
             res = RegDeleteValueW(hroot, (LPWSTR) pInputData);
             RegCloseKey(hroot);
-            TRACE("=> %u with %u\n", res, GetLastError() );
+            TRACE("=> %lu with %lu\n", res, GetLastError() );
             return res;
         }
         return ERROR_FILE_NOT_FOUND;
     }

if (!lstrcmpW(pszDataName, L"GetDefaultCommConfig")) {
-        TRACE("InputData (%d): %s\n", cbInputData, debugstr_w( (LPWSTR) pInputData));
+        TRACE("InputData (%ld): %s\n", cbInputData, debugstr_w( (LPWSTR) pInputData));
         *pcbOutputNeeded = cbOutputData;
         res = GetDefaultCommConfigW((LPWSTR) pInputData, (LPCOMMCONFIG) pOutputData, pcbOutputNeeded);
-        TRACE("got %u with %u\n", res, GetLastError() );
+        TRACE("got %lu with %lu\n", res, GetLastError() );
         return res ? ERROR_SUCCESS : GetLastError();
     }

@@ -657,14 +657,14 @@ static DWORD WINAPI localmon_XcvDataPort(HANDLE hXcv, LPCWSTR pszDataName, PBYTE
     }

if (!lstrcmpW(pszDataName, L"PortIsValid")) {
-        TRACE("InputData (%d): %s\n", cbInputData, debugstr_w( (LPWSTR) pInputData));
+        TRACE("InputData (%ld): %s\n", cbInputData, debugstr_w( (LPWSTR) pInputData));
         res = get_type_from_name((LPCWSTR) pInputData);
-        TRACE("detected as %u\n",  res);
+        TRACE("detected as %lu\n",  res);
         /* names, that we have recognized, are valid */
         if (res) return ERROR_SUCCESS;

/* ERROR_ACCESS_DENIED, ERROR_PATH_NOT_FOUND or something else */
-        TRACE("=> %u\n", GetLastError());
+        TRACE("=> %lu\n", GetLastError());
         return GetLastError();
     }

@@ -681,7 +681,7 @@ static DWORD WINAPI localmon_XcvDataPort(HANDLE hXcv, LPCWSTR pszDataName, PBYTE
         lstrcpynW(buffer, ptr, ARRAY_SIZE(buffer));
         if (buffer[0]) buffer[lstrlenW(buffer)-1] = '\0';  /* remove the ':' */
         res = SetDefaultCommConfigW(buffer, (LPCOMMCONFIG) pInputData, cbInputData);
-        TRACE("got %u with %u\n", res, GetLastError() );
+        TRACE("got %lu with %lu\n", res, GetLastError() );
         return res ? ERROR_SUCCESS : GetLastError();
     }

@@ -708,7 +708,7 @@ static BOOL WINAPI localmon_XcvOpenPort(LPCWSTR pName, ACCESS_MASK GrantedAccess
 {
     xcv_t * xcv;

-    TRACE("%s, 0x%x, %p)\n", debugstr_w(pName), GrantedAccess, phXcv);
+    TRACE("%s, 0x%lx, %p)\n", debugstr_w(pName), GrantedAccess, phXcv);
     /* No checks for any field is done in Windows */
     xcv = heap_alloc(FIELD_OFFSET(xcv_t, nameW[lstrlenW(pName) + 1]));
     if (xcv) {
diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c
index aded4ed44c4..ca8dc5fbe78 100644
--- a/dlls/localspl/provider.c
+++ b/dlls/localspl/provider.c
@@ -329,7 +329,7 @@ static BOOL apd_copyfile( WCHAR *pathname, WCHAR *file_part, apd_data_t *apd )

/* FIXME: handle APD_COPY_NEW_FILES */
     res = CopyFileW(srcname, apd->dst, FALSE);
-    TRACE("got %d with %u\n", res, GetLastError());
+    TRACE("got %d with %lu\n", res, GetLastError());

return apd->lazy || res;
 }
@@ -419,7 +419,7 @@ static LPCWSTR get_basename_from_name(LPCWSTR name)
 static void monitor_unload(monitor_t * pm)
 {
     if (pm == NULL) return;
-    TRACE("%p (refcount: %d) %s\n", pm, pm->refcount, debugstr_w(pm->name));
+    TRACE("%p (refcount: %ld) %s\n", pm, pm->refcount, debugstr_w(pm->name));

EnterCriticalSection(&monitor_handles_cs);

@@ -629,7 +629,7 @@ static monitor_t * monitor_load(LPCWSTR name, LPWSTR dllname)
         }

pm->hdll = LoadLibraryW(driver);
-        TRACE("%p: LoadLibrary(%s) => %d\n", pm->hdll, debugstr_w(driver), GetLastError());
+        TRACE("%p: LoadLibrary(%s) => %ld\n", pm->hdll, debugstr_w(driver), GetLastError());

if (pm->hdll == NULL) {
             monitor_unload(pm);
@@ -655,7 +655,7 @@ static monitor_t * monitor_load(LPCWSTR name, LPWSTR dllname)
             pm->monitorUI = pInitializePrintMonitorUI();
             TRACE("%p: MONITORUI from %s,InitializePrintMonitorUI()\n", pm->monitorUI, debugstr_w(driver));
             if (pm->monitorUI) {
-                TRACE("0x%08x: dwMonitorSize (%d)\n",
+                TRACE("0x%08lx: dwMonitorSize (%ld)\n",
                         pm->monitorUI->dwMonitorUISize, pm->monitorUI->dwMonitorUISize);

}
@@ -760,7 +760,7 @@ static DWORD monitor_loadall(void)
         RegQueryInfoKeyW(hmonitors, NULL, NULL, NULL, &registered, NULL, NULL,
                         NULL, NULL, NULL, NULL, NULL);

-        TRACE("%d monitors registered\n", registered);
+        TRACE("%ld monitors registered\n", registered);

while (id < registered) {
             buffer[0] = '\0';
@@ -771,7 +771,7 @@ static DWORD monitor_loadall(void)
         }
         RegCloseKey(hmonitors);
     }
-    TRACE("%d monitors loaded\n", loaded);
+    TRACE("%ld monitors loaded\n", loaded);
     return loaded;
 }

@@ -807,10 +807,10 @@ static monitor_t * monitor_loadui(monitor_t * pm)
         res = pm->monitor.pfnXcvOpenPort(pm->hmon, L"", SERVER_ACCESS_ADMINISTER, &hXcv);
     else if (pm->old_XcvOpenPort)
         res = pm->old_XcvOpenPort(L"", SERVER_ACCESS_ADMINISTER, &hXcv);
-    TRACE("got %u with %p\n", res, hXcv);
+    TRACE("got %lu with %p\n", res, hXcv);
     if (res) {
         res = pm->monitor.pfnXcvDataPort(hXcv, L"MonitorUI", NULL, 0, (BYTE *) buffer, sizeof(buffer), &len);
-        TRACE("got %u with %s\n", res, debugstr_w(buffer));
+        TRACE("got %lu with %s\n", res, debugstr_w(buffer));
         if (res == ERROR_SUCCESS) pui = monitor_load(NULL, buffer);
         pm->monitor.pfnXcvClosePort(hXcv);
     }
@@ -981,7 +981,7 @@ static DWORD get_local_monitors(DWORD level, LPBYTE pMonitors, DWORD cbBuf, LPDW
     if (RegCreateKeyW(HKEY_LOCAL_MACHINE, monitorsW, &hroot) == ERROR_SUCCESS) {
         /* Scan all Monitor-Registry-Keys */
         while (RegEnumKeyExW(hroot, index, buffer, &len, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) {
-            TRACE("Monitor_%d: %s\n", numentries, debugstr_w(buffer));
+            TRACE("Monitor_%ld: %s\n", numentries, debugstr_w(buffer));
             dllsize = sizeof(dllname);
             dllname[0] = '\0';

@@ -1011,7 +1011,7 @@ static DWORD get_local_monitors(DWORD level, LPBYTE pMonitors, DWORD cbBuf, LPDW
                     mi = (LPMONITOR_INFO_2W) pMonitors;
                     pMonitors += entrysize;

-                    TRACE("%p: writing MONITOR_INFO_%dW #%d\n", mi, level, numentries);
+                    TRACE("%p: writing MONITOR_INFO_%ldW #%ld\n", mi, level, numentries);
                     mi->pName = ptr;
                     lstrcpyW(ptr, buffer);      /* Name of the Monitor */
                     ptr += (len+1);               /* len is lstrlenW(monitorname) */
@@ -1033,7 +1033,7 @@ static DWORD get_local_monitors(DWORD level, LPBYTE pMonitors, DWORD cbBuf, LPDW
         RegCloseKey(hroot);
     }
     *lpreturned = numentries;
-    TRACE("need %d byte for %d entries\n", needed, numentries);
+    TRACE("need %ld byte for %ld entries\n", needed, numentries);
     return needed;
 }

@@ -1074,7 +1074,7 @@ static DWORD get_local_printprocessors(LPWSTR regpathW, LPBYTE pPPInfo, DWORD cb
             ppi = (PPRINTPROCESSOR_INFO_1W) pPPInfo;
             pPPInfo += sizeof(PRINTPROCESSOR_INFO_1W);

-            TRACE("%p: writing PRINTPROCESSOR_INFO_1W #%d\n", ppi, numentries);
+            TRACE("%p: writing PRINTPROCESSOR_INFO_1W #%ld\n", ppi, numentries);
             ppi->pName = ptr;
             lstrcpyW(ptr, L"winprint");      /* Name of the Print Processor */
             ptr += ARRAY_SIZE(L"winprint");
@@ -1083,7 +1083,7 @@ static DWORD get_local_printprocessors(LPWSTR regpathW, LPBYTE pPPInfo, DWORD cb
         /* Scan all Printprocessor Keys */
         while ((RegEnumKeyExW(hroot, index, buffer, &len, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) &&
             (lstrcmpiW(buffer, L"winprint") != 0)) {
-            TRACE("PrintProcessor_%d: %s\n", numentries, debugstr_w(buffer));
+            TRACE("PrintProcessor_%ld: %s\n", numentries, debugstr_w(buffer));
             dllsize = sizeof(dllname);
             dllname[0] = '\0';

@@ -1106,7 +1106,7 @@ static DWORD get_local_printprocessors(LPWSTR regpathW, LPBYTE pPPInfo, DWORD cb
                     ppi = (PPRINTPROCESSOR_INFO_1W) pPPInfo;
                     pPPInfo += sizeof(PRINTPROCESSOR_INFO_1W);

-                    TRACE("%p: writing PRINTPROCESSOR_INFO_1W #%d\n", ppi, numentries);
+                    TRACE("%p: writing PRINTPROCESSOR_INFO_1W #%ld\n", ppi, numentries);
                     ppi->pName = ptr;
                     lstrcpyW(ptr, buffer);      /* Name of the Print Processor */
                     ptr += (len+1);             /* len is lstrlenW(printprosessor name) */
@@ -1119,7 +1119,7 @@ static DWORD get_local_printprocessors(LPWSTR regpathW, LPBYTE pPPInfo, DWORD cb
         RegCloseKey(hroot);
     }
     *lpreturned = numentries;
-    TRACE("need %d byte for %d entries\n", needed, numentries);
+    TRACE("need %ld byte for %ld entries\n", needed, numentries);
     return needed;
 }

@@ -1160,7 +1160,7 @@ static DWORD get_ports_from_all_monitors(DWORD level, LPBYTE pPorts, DWORD cbBuf
     DWORD   numentries;
     DWORD   entrysize;

-    TRACE("(%d, %p, %d, %p)\n", level, pPorts, cbBuf, lpreturned);
+    TRACE("(%ld, %p, %ld, %p)\n", level, pPorts, cbBuf, lpreturned);
     entrysize = (level == 1) ? sizeof(PORT_INFO_1W) : sizeof(PORT_INFO_2W);

numentries = *lpreturned;       /* this is 0, when we scan the registry */
@@ -1183,7 +1183,7 @@ static DWORD get_ports_from_all_monitors(DWORD level, LPBYTE pPorts, DWORD cbBuf
                 pi_allocated = (pi_buffer) ? pi_needed : 0;
                 res = wrap_EnumPorts(pm, NULL, level, pi_buffer, pi_allocated, &pi_needed, &pi_returned);
             }
-            TRACE("(%s) got %d with %d (need %d byte for %d entries)\n",
+            TRACE("(%s) got %ld with %ld (need %ld byte for %ld entries)\n",
                   debugstr_w(pm->name), res, GetLastError(), pi_needed, pi_returned);

numentries += pi_returned;
@@ -1219,7 +1219,7 @@ static DWORD get_ports_from_all_monitors(DWORD level, LPBYTE pPorts, DWORD cbBuf
     heap_free(pi_buffer);

*lpreturned = numentries;
-    TRACE("need %d byte for %d entries\n", needed, numentries);
+    TRACE("need %ld byte for %ld entries\n", needed, numentries);
     return needed;
 }

@@ -1290,7 +1290,7 @@ static BOOL WINAPI fpGetPrinterDriverDirectory(LPWSTR pName, LPWSTR pEnvironment
     const printenv_t * env;
     WCHAR * const dir = (WCHAR *)pDriverDirectory;

-    TRACE("(%s, %s, %d, %p, %d, %p)\n", debugstr_w(pName),
+    TRACE("(%s, %s, %ld, %p, %ld, %p)\n", debugstr_w(pName),
           debugstr_w(pEnvironment), Level, pDriverDirectory, cbBuf, pcbNeeded);

if (pName != NULL && pName[0]) {
@@ -1370,7 +1370,7 @@ static HMODULE driver_load(const printenv_t * env, LPWSTR dllname)
     lstrcatW(fullname, dllname);

hui = LoadLibraryW(fullname);
-    TRACE("%p: LoadLibrary(%s) %d\n", hui, debugstr_w(fullname), GetLastError());
+    TRACE("%p: LoadLibrary(%s) %ld\n", hui, debugstr_w(fullname), GetLastError());

return hui;
 }
@@ -1551,7 +1551,7 @@ static BOOL myAddPrinterDriverEx(DWORD level, LPBYTE pDriverInfo, DWORD dwFileCo
     }

/* dump the most used infos */
-    TRACE("%p: .cVersion    : 0x%x/%d\n", pDriverInfo, di.cVersion, di.cVersion);
+    TRACE("%p: .cVersion    : 0x%lx/%ld\n", pDriverInfo, di.cVersion, di.cVersion);
     TRACE("%p: .pName       : %s\n", di.pName, debugstr_w(di.pName));
     TRACE("%p: .pEnvironment: %s\n", di.pEnvironment, debugstr_w(di.pEnvironment));
     TRACE("%p: .pDriverPath : %s\n", di.pDriverPath, debugstr_w(di.pDriverPath));
@@ -1595,7 +1595,7 @@ static BOOL myAddPrinterDriverEx(DWORD level, LPBYTE pDriverInfo, DWORD dwFileCo
                                 KEY_WRITE | KEY_QUERY_VALUE, NULL,
                                 &hdrv, &disposition)) != ERROR_SUCCESS) {

-        ERR("can't create driver %s: %u\n", debugstr_w(di.pName), lres);
+        ERR("can't create driver %s: %lu\n", debugstr_w(di.pName), lres);
         RegCloseKey(hroot);
         SetLastError(lres);
         return FALSE;
@@ -1669,7 +1669,7 @@ static BOOL myAddPrinterDriverEx(DWORD level, LPBYTE pDriverInfo, DWORD dwFileCo
     else
         RegSetValueExW(hdrv, L"Previous Names", 0, REG_MULTI_SZ, (const BYTE*)L"", sizeof(L""));

-    if (level > 5) TRACE("level %u for Driver %s is incomplete\n", level, debugstr_w(di.pName));
+    if (level > 5) TRACE("level %lu for Driver %s is incomplete\n", level, debugstr_w(di.pName));

RegCloseKey(hdrv);
     hui = driver_load(env, di.pConfigFile);
@@ -1684,7 +1684,7 @@ static BOOL myAddPrinterDriverEx(DWORD level, LPBYTE pDriverInfo, DWORD dwFileCo
     }
     FreeLibrary(hui);

-    TRACE("=> TRUE with %u\n", GetLastError());
+    TRACE("=> TRUE with %lu\n", GetLastError());
     return TRUE;

}
@@ -1718,7 +1718,7 @@ static BOOL WINAPI fpAddMonitor(LPWSTR pName, DWORD Level, LPBYTE pMonitors)
     BOOL    res = FALSE;

mi2w = (LPMONITOR_INFO_2W) pMonitors;
-    TRACE("(%s, %d, %p): %s %s %s\n", debugstr_w(pName), Level, pMonitors,
+    TRACE("(%s, %ld, %p): %s %s %s\n", debugstr_w(pName), Level, pMonitors,
         debugstr_w(mi2w->pName), debugstr_w(mi2w->pEnvironment), debugstr_w(mi2w->pDLLName));

if (copy_servername_from_name(pName, NULL)) {
@@ -1843,14 +1843,14 @@ static BOOL WINAPI fpAddPort(LPWSTR pName, HWND hWnd, LPWSTR pMonitorName)
     pm = monitor_load(pMonitorName, NULL);
     if (pm && (pm->monitor.pfnAddPort || pm->old_AddPort)) {
         res = wrap_AddPort(pm, pName, hWnd, pMonitorName);
-        TRACE("got %d with %u (%s)\n", res, GetLastError(), debugstr_w(pm->dllname));
+        TRACE("got %ld with %lu (%s)\n", res, GetLastError(), debugstr_w(pm->dllname));
     }
     else
     {
         pui = monitor_loadui(pm);
         if (pui && pui->monitorUI && pui->monitorUI->pfnAddPortUI) {
             res = pui->monitorUI->pfnAddPortUI(pName, hWnd, pMonitorName, NULL);
-            TRACE("got %d with %u (%s)\n", res, GetLastError(), debugstr_w(pui->dllname));
+            TRACE("got %ld with %lu (%s)\n", res, GetLastError(), debugstr_w(pui->dllname));
         }
         else
         {
@@ -1865,7 +1865,7 @@ static BOOL WINAPI fpAddPort(LPWSTR pName, HWND hWnd, LPWSTR pMonitorName)
     }
     monitor_unload(pm);

-    TRACE("returning %d with %u\n", res, GetLastError());
+    TRACE("returning %ld with %lu\n", res, GetLastError());
     return res;
 }

@@ -1906,7 +1906,7 @@ static BOOL WINAPI fpAddPortEx(LPWSTR pName, DWORD level, LPBYTE pBuffer, LPWSTR

pi2 = (PORT_INFO_2W *) pBuffer;

-    TRACE("(%s, %d, %p, %s): %s %s %s\n", debugstr_w(pName), level, pBuffer,
+    TRACE("(%s, %ld, %p, %s): %s %s %s\n", debugstr_w(pName), level, pBuffer,
             debugstr_w(pMonitorName), debugstr_w(pi2 ? pi2->pPortName : NULL),
             debugstr_w(((level > 1) && pi2) ? pi2->pMonitorName : NULL),
             debugstr_w(((level > 1) && pi2) ? pi2->pDescription : NULL));
@@ -1933,7 +1933,7 @@ static BOOL WINAPI fpAddPortEx(LPWSTR pName, DWORD level, LPBYTE pBuffer, LPWSTR
     if (pm && (pm->monitor.pfnAddPortEx || pm->old_AddPortEx))
     {
         res = wrap_AddPortEx(pm, pName, level, pBuffer, pMonitorName);
-        TRACE("got %d with %u (%s)\n", res, GetLastError(), debugstr_w(pm->dllname));
+        TRACE("got %ld with %lu (%s)\n", res, GetLastError(), debugstr_w(pm->dllname));
     }
     else
     {
@@ -1966,7 +1966,7 @@ static BOOL WINAPI fpAddPrinterDriverEx(LPWSTR pName, DWORD level, LPBYTE pDrive
 {
     LONG lres;

-    TRACE("(%s, %d, %p, 0x%x)\n", debugstr_w(pName), level, pDriverInfo, dwFileCopyFlags);
+    TRACE("(%s, %ld, %p, 0x%lx)\n", debugstr_w(pName), level, pDriverInfo, dwFileCopyFlags);
     lres = copy_servername_from_name(pName, NULL);
     if (lres) {
         FIXME("server %s not supported\n", debugstr_w(pName));
@@ -1975,7 +1975,7 @@ static BOOL WINAPI fpAddPrinterDriverEx(LPWSTR pName, DWORD level, LPBYTE pDrive
     }

if ((dwFileCopyFlags & ~APD_COPY_FROM_DIRECTORY) != APD_COPY_ALL_FILES) {
-        TRACE("Flags 0x%x ignored (using APD_COPY_ALL_FILES)\n", dwFileCopyFlags & ~APD_COPY_FROM_DIRECTORY);
+        TRACE("Flags 0x%lx ignored (using APD_COPY_ALL_FILES)\n", dwFileCopyFlags & ~APD_COPY_FROM_DIRECTORY);
     }

return myAddPrinterDriverEx(level, pDriverInfo, dwFileCopyFlags, TRUE);
@@ -2062,7 +2062,7 @@ static BOOL WINAPI fpConfigurePort(LPWSTR pName, HWND hWnd, LPWSTR pPortName)
         TRACE("use %s for %s (monitor %p: %s)\n", debugstr_w(pm->name),
                 debugstr_w(pPortName), pm, debugstr_w(pm->dllname));
         res = wrap_ConfigurePort(pm, pName, hWnd, pPortName);
-        TRACE("got %d with %u\n", res, GetLastError());
+        TRACE("got %ld with %lu\n", res, GetLastError());
     }
     else
     {
@@ -2071,7 +2071,7 @@ static BOOL WINAPI fpConfigurePort(LPWSTR pName, HWND hWnd, LPWSTR pPortName)
             TRACE("use %s for %s (monitorui %p: %s)\n", debugstr_w(pui->name),
                         debugstr_w(pPortName), pui, debugstr_w(pui->dllname));
             res = pui->monitorUI->pfnConfigurePortUI(pName, hWnd, pPortName);
-            TRACE("got %d with %u\n", res, GetLastError());
+            TRACE("got %ld with %lu\n", res, GetLastError());
         }
         else
         {
@@ -2086,7 +2086,7 @@ static BOOL WINAPI fpConfigurePort(LPWSTR pName, HWND hWnd, LPWSTR pPortName)
     }
     monitor_unload(pm);

-    TRACE("returning %d with %u\n", res, GetLastError());
+    TRACE("returning %ld with %lu\n", res, GetLastError());
     return res;
 }

@@ -2218,7 +2218,7 @@ static BOOL WINAPI fpDeletePort(LPWSTR pName, HWND hWnd, LPWSTR pPortName)
         TRACE("use %s for %s (monitor %p: %s)\n", debugstr_w(pm->name),
                 debugstr_w(pPortName), pm, debugstr_w(pm->dllname));
         res = wrap_DeletePort(pm, pName, hWnd, pPortName);
-        TRACE("got %d with %u\n", res, GetLastError());
+        TRACE("got %ld with %lu\n", res, GetLastError());
     }
     else
     {
@@ -2227,7 +2227,7 @@ static BOOL WINAPI fpDeletePort(LPWSTR pName, HWND hWnd, LPWSTR pPortName)
             TRACE("use %s for %s (monitorui %p: %s)\n", debugstr_w(pui->name),
                         debugstr_w(pPortName), pui, debugstr_w(pui->dllname));
             res = pui->monitorUI->pfnDeletePortUI(pName, hWnd, pPortName);
-            TRACE("got %d with %u\n", res, GetLastError());
+            TRACE("got %ld with %lu\n", res, GetLastError());
         }
         else
         {
@@ -2242,7 +2242,7 @@ static BOOL WINAPI fpDeletePort(LPWSTR pName, HWND hWnd, LPWSTR pPortName)
     }
     monitor_unload(pm);

-    TRACE("returning %d with %u\n", res, GetLastError());
+    TRACE("returning %ld with %lu\n", res, GetLastError());
     return res;
 }

@@ -2275,7 +2275,7 @@ static BOOL WINAPI fpEnumMonitors(LPWSTR pName, DWORD Level, LPBYTE pMonitors, D
     LONG    lres;
     BOOL    res = FALSE;

-    TRACE("(%s, %d, %p, %d, %p, %p)\n", debugstr_w(pName), Level, pMonitors,
+    TRACE("(%s, %ld, %p, %ld, %p, %p)\n", debugstr_w(pName), Level, pMonitors,
           cbBuf, pcbNeeded, pcReturned);

lres = copy_servername_from_name(pName, NULL);
@@ -2286,7 +2286,7 @@ static BOOL WINAPI fpEnumMonitors(LPWSTR pName, DWORD Level, LPBYTE pMonitors, D
     }

if (!Level || (Level > 2)) {
-        WARN("level (%d) is ignored in win9x\n", Level);
+        WARN("level (%ld) is ignored in win9x\n", Level);
         SetLastError(ERROR_INVALID_LEVEL);
         return FALSE;
     }
@@ -2309,7 +2309,7 @@ em_cleanup:
     if (pcbNeeded)  *pcbNeeded = needed;
     if (pcReturned) *pcReturned = numentries;

-    TRACE("returning %d with %d (%d byte for %d entries)\n",
+    TRACE("returning %d with %ld (%ld byte for %ld entries)\n",
             res, GetLastError(), needed, numentries);

return (res);
@@ -2341,7 +2341,7 @@ static BOOL WINAPI fpEnumPorts(LPWSTR pName, DWORD Level, LPBYTE pPorts, DWORD c
     LONG    lres;
     BOOL    res = FALSE;

-    TRACE("(%s, %d, %p, %d, %p, %p)\n", debugstr_w(pName), Level, pPorts,
+    TRACE("(%s, %ld, %p, %ld, %p, %p)\n", debugstr_w(pName), Level, pPorts,
           cbBuf, pcbNeeded, pcReturned);

lres = copy_servername_from_name(pName, NULL);
@@ -2392,7 +2392,7 @@ emP_cleanup:
     if (pcbNeeded)  *pcbNeeded = needed;
     if (pcReturned) *pcReturned = (res) ? numentries : 0;

-    TRACE("returning %d with %d (%d byte for %d of %d entries)\n",
+    TRACE("returning %d with %ld (%ld byte for %ld of %ld entries)\n",
           (res), GetLastError(), needed, (res) ? numentries : 0, numentries);

return (res);
@@ -2427,7 +2427,7 @@ static BOOL WINAPI fpEnumPrintProcessors(LPWSTR pName, LPWSTR pEnvironment, DWOR
     LONG    lres;
     BOOL    res = FALSE;

-    TRACE("(%s, %s, %d, %p, %d, %p, %p)\n", debugstr_w(pName), debugstr_w(pEnvironment),
+    TRACE("(%s, %s, %ld, %p, %ld, %p, %p)\n", debugstr_w(pName), debugstr_w(pEnvironment),
                                 Level, pPPInfo, cbBuf, pcbNeeded, pcReturned);

lres = copy_servername_from_name(pName, NULL);
@@ -2473,7 +2473,7 @@ epp_cleanup:
     if (pcbNeeded)  *pcbNeeded = needed;
     if (pcReturned) *pcReturned = numentries;

-    TRACE("returning %d with %d (%d byte for %d entries)\n",
+    TRACE("returning %d with %ld (%ld byte for %ld entries)\n",
             res, GetLastError(), needed, numentries);

return (res);
@@ -2511,7 +2511,7 @@ static BOOL WINAPI fpGetPrintProcessorDirectory(LPWSTR pName, LPWSTR pEnvironmen
     DWORD needed;
     LONG  lres;

-    TRACE("(%s, %s, %d, %p, %d, %p)\n", debugstr_w(pName), debugstr_w(pEnvironment),
+    TRACE("(%s, %s, %ld, %p, %ld, %p)\n", debugstr_w(pName), debugstr_w(pEnvironment),
                                         level, pPPInfo, cbBuf, pcbNeeded);

*pcbNeeded = 0;
@@ -2623,7 +2623,7 @@ static BOOL WINAPI fpXcvData(HANDLE hXcv, LPCWSTR pszDataName, PBYTE pInputData,
 {
     printer_t *printer = (printer_t * ) hXcv;

-    TRACE("(%p, %s, %p, %d, %p, %d, %p, %p)\n", hXcv, debugstr_w(pszDataName),
+    TRACE("(%p, %s, %p, %ld, %p, %ld, %p, %p)\n", hXcv, debugstr_w(pszDataName),
           pInputData, cbInputData, pOutputData,
           cbOutputData, pcbOutputNeeded, pdwStatus);

@@ -2720,7 +2720,7 @@ static void fill_builtin_form_info( BYTE **base, WCHAR **strings, const struct b

static BOOL WINAPI fpAddForm( HANDLE printer, DWORD level, BYTE *form )
 {
-    FIXME( "(%p, %d, %p): stub\n", printer, level, form );
+    FIXME( "(%p, %ld, %p): stub\n", printer, level, form );
     return TRUE;
 }

@@ -2738,7 +2738,7 @@ static BOOL WINAPI fpGetForm( HANDLE printer, WCHAR *name, DWORD level, BYTE *fo
     BYTE *base = form;
     DWORD i;

-    TRACE( "(%p, %s, %d, %p, %d, %p)\n", printer, debugstr_w( name ), level, form, size, needed );
+    TRACE( "(%p, %s, %ld, %p, %ld, %p)\n", printer, debugstr_w( name ), level, form, size, needed );

*needed = 0;

@@ -2774,7 +2774,7 @@ static BOOL WINAPI fpGetForm( HANDLE printer, WCHAR *name, DWORD level, BYTE *fo

static BOOL WINAPI fpSetForm( HANDLE printer, WCHAR *name, DWORD level, BYTE *form )
 {
-    FIXME( "(%p, %s, %d, %p): stub\n", printer, debugstr_w( name ), level, form );
+    FIXME( "(%p, %s, %ld, %p): stub\n", printer, debugstr_w( name ), level, form );
     return FALSE;
 }

@@ -2785,7 +2785,7 @@ static BOOL WINAPI fpEnumForms( HANDLE printer, DWORD level, BYTE *form, DWORD s
     BYTE *base = form;
     size_t struct_size = form_struct_size( level );

-    TRACE( "(%p, %d, %p, %d, %p, %p)\n", printer, level, form, size, needed, count );
+    TRACE( "(%p, %ld, %p, %ld, %p, %p)\n", printer, level, form, size, needed, count );

*count = *needed = 0;

@@ -2921,7 +2921,7 @@ BOOL WINAPI InitializePrintProvidor(LPPRINTPROVIDOR pPrintProvidor,
                                     DWORD cbPrintProvidor, LPWSTR pFullRegistryPath)
 {

-    TRACE("(%p, %u, %s)\n", pPrintProvidor, cbPrintProvidor, debugstr_w(pFullRegistryPath));
+    TRACE("(%p, %lu, %s)\n", pPrintProvidor, cbPrintProvidor, debugstr_w(pFullRegistryPath));
     memcpy(pPrintProvidor, &backend,
           (cbPrintProvidor < sizeof(PRINTPROVIDOR)) ? cbPrintProvidor : sizeof(PRINTPROVIDOR));

[PATCH 22/23] dlls/localspl: enable compilation with long types

[Huw Davies]

Signed-off-by: Huw Davies

[PATCH 23/23] dlls/localui: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech

---
 dlls/localui/Makefile.in |    1 -
 dlls/localui/localui.c   |   18 +++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/dlls/localui/Makefile.in b/dlls/localui/Makefile.in
index 71135130da1..eb4273f8d93 100644
--- a/dlls/localui/Makefile.in
+++ b/dlls/localui/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = localui.dll
 IMPORTS   = winspool user32

diff --git a/dlls/localui/localui.c b/dlls/localui/localui.c
index 87522494a1d..643b01d7b3f 100644
--- a/dlls/localui/localui.c
+++ b/dlls/localui/localui.c
@@ -134,7 +134,7 @@ static BOOL dlg_configure_lpt(HANDLE hXcv, HWND hWnd)
     res = DialogBoxParamW(LOCALUI_hInstance, MAKEINTRESOURCEW(LPTCONFIG_DIALOG), hWnd,
                                dlgproc_lptconfig, (LPARAM) &data);

-    TRACE("got %u with %u\n", res, GetLastError());
+    TRACE("got %u with %lu\n", res, GetLastError());

if (!res) SetLastError(ERROR_CANCELLED);
     return res;
@@ -270,7 +270,7 @@ static INT_PTR CALLBACK dlgproc_addport(HWND hwnd, UINT msg, WPARAM wparam, LPAR
                             (lstrlenW(data->portname) + 1) * sizeof(WCHAR),
                             (PBYTE) &dummy, 0, &len, &status);

-            TRACE("got %u with status %u\n", res, status);
+            TRACE("got %lu with status %lu\n", res, status);
             if (res && (status == ERROR_SUCCESS)) {
                 /* The caller must free data->portname */
                 EndDialog(hwnd, TRUE);
@@ -334,7 +334,7 @@ static INT_PTR CALLBACK dlgproc_lptconfig(HWND hwnd, UINT msg, WPARAM wparam, LP
                         (PBYTE) &dummy, 0,
                         (PBYTE) &data->value, sizeof(data->value), &len, &status);

-        TRACE("got %u with status %u\n", res, status);
+        TRACE("got %lu with status %lu\n", res, status);

/* Set current setting as the initial value in the Dialog */
         SetDlgItemInt(hwnd, LPTCONFIG_EDIT, data->value, FALSE);
@@ -349,7 +349,7 @@ static INT_PTR CALLBACK dlgproc_lptconfig(HWND hwnd, UINT msg, WPARAM wparam, LP
             res = GetDlgItemInt(hwnd, LPTCONFIG_EDIT, (BOOL *) &status, FALSE);
             /* length is in WCHAR, including the '\0' */
             GetDlgItemTextW(hwnd, LPTCONFIG_EDIT, bufferW, ARRAY_SIZE(bufferW));
-            TRACE("got %s and %u (translated: %u)\n", debugstr_w(bufferW), res, status);
+            TRACE("got %s and %lu (translated: %lu)\n", debugstr_w(bufferW), res, status);

/* native localui.dll use the same limits */
             if ((res > 0) && (res < 1000000) && status) {
@@ -359,7 +359,7 @@ static INT_PTR CALLBACK dlgproc_lptconfig(HWND hwnd, UINT msg, WPARAM wparam, LP
                         (lstrlenW(bufferW) +1) * sizeof(WCHAR),
                         (PBYTE) &dummy, 0, &len, &status);

-                TRACE("got %u with status %u\n", res, status);
+                TRACE("got %lu with status %lu\n", res, status);
                 EndDialog(hwnd, TRUE);
                 return TRUE;
             }
@@ -489,7 +489,7 @@ static BOOL WINAPI localui_AddPortUI(PCWSTR pName, HWND hWnd, PCWSTR pMonitorNam
         res = DialogBoxParamW(LOCALUI_hInstance, MAKEINTRESOURCEW(ADDPORT_DIALOG), hWnd,
                                dlgproc_addport, (LPARAM) &data);

-        TRACE("got %u with %u for %s\n", res, GetLastError(), debugstr_w(data.portname));
+        TRACE("got %lu with %lu for %s\n", res, GetLastError(), debugstr_w(data.portname));

if (ppPortName) *ppPortName = NULL;

@@ -498,7 +498,7 @@ static BOOL WINAPI localui_AddPortUI(PCWSTR pName, HWND hWnd, PCWSTR pMonitorNam
                             (lstrlenW(data.portname)+1) * sizeof(WCHAR),
                             (PBYTE) &dummy, 0, &needed, &status);

-            TRACE("got %u with status %u\n", res, status);
+            TRACE("got %lu with status %lu\n", res, status);
             if (res && (status == ERROR_SUCCESS) && ppPortName) {
                 /* Native localui uses GlobalAlloc also.
                    The caller must GlobalFree the buffer */
@@ -520,7 +520,7 @@ static BOOL WINAPI localui_AddPortUI(PCWSTR pName, HWND hWnd, PCWSTR pMonitorNam
         ClosePrinter(hXcv);
     }

-    TRACE("=> %u with %u\n", res, GetLastError());
+    TRACE("=> %lu with %lu\n", res, GetLastError());
     return res;
 }

@@ -652,7 +652,7 @@ PMONITORUI WINAPI InitializePrintMonitorUI(void)
  */
 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
-    TRACE("(%p, %d, %p)\n",hinstDLL, fdwReason, lpvReserved);
+    TRACE("(%p, %ld, %p)\n",hinstDLL, fdwReason, lpvReserved);

switch(fdwReason)
     {