ieframe: Enable compilation with long types.

Signed-off-by: Eric Pouech <eric.pouech@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ieframe: Enable compilation with long types.
589071d2 · Eric Pouech · Alexandre Julliard · 6c7d61be · 589071d2 · 589071d2
Commit 589071d2 authored Feb 11, 2022 by Eric Pouech Committed by Alexandre Julliard Feb 11, 2022
18 changed files
--- a/dlls/ieframe/Makefile.in
+++ b/dlls/ieframe/Makefile.in
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = ieframe.dll
 IMPORTLIB = ieframe
 IMPORTS   = uuid urlmon shell32 comctl32 shlwapi oleaut32 ole32 user32 gdi32 advapi32

--- 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;
    }

--- 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;
 }

--- 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;
 }

--- 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;

--- 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;

--- 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)
    {

--- 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;
 }

--- 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);
    }

--- 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,

--- 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"
+            "    %ld, %s,\n"
-            "    {%d, %p, %p},\n"
+            "    {%ld, %p, %p},\n"
            "    %s,\n"
            "    %s,\n"
            "    %s,\n"
-            "    %d, %08x, %d, %d\n"
+            "    %ld, %08lx, %ld, %ld\n"
-            "    {%d %p %x},\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));
    /*

--- 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;
 }

--- 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;
 }

--- 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;
 }

--- 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;
 }

--- 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;
 }

--- 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;
 }

--- 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;