Skip to content

W
wine-cw
Commit e5f2f651 authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard
Browse files
Options

shdocvw: Win64 printf format warning fixes.

parent 7e340f8f
Hide whitespace changes
Inline Side-by-side
Showing with 79 additions and 79 deletions
dlls/shdocvw/Makefile.in
View file @ e5f2f651
EXTRADEFS = -D_SHDOCVW_ -DWINE_NO_LONG_AS_INT
EXTRADEFS = -D_SHDOCVW_
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
......
dlls/shdocvw/classinfo.c
View file @ e5f2f651
......@@ -65,13 +65,13 @@ static HRESULT WINAPI ProvideClassInfo_GetGUID(IProvideClassInfo2 *iface,
{
WebBrowser *This = CLASSINFO_THIS(iface);
TRACE("(%p)->(%ld %p)\n", This, dwGuidKind, pGUID);
TRACE("(%p)->(%d %p)\n", This, dwGuidKind, pGUID);
if(!pGUID)
return E_POINTER;
if (dwGuidKind != GUIDKIND_DEFAULT_SOURCE_DISP_IID) {
WARN("Wrong GUID type: %ld\n", dwGuidKind);
WARN("Wrong GUID type: %d\n", dwGuidKind);
memcpy(pGUID, &IID_NULL, sizeof(GUID));
return E_FAIL;
}
......
dlls/shdocvw/client.c
View file @ e5f2f651
......@@ -94,7 +94,7 @@ static HRESULT WINAPI ClientSite_GetMoniker(IOleClientSite *iface, DWORD dwAssig
DWORD dwWhichMoniker, IMoniker **ppmk)
{
DocHost *This = CLIENTSITE_THIS(iface);
FIXME("(%p)->(%ld %ld %p)\n", This, dwAssign, dwWhichMoniker, ppmk);
FIXME("(%p)->(%d %d %p)\n", This, dwAssign, dwWhichMoniker, ppmk);
return E_NOTIMPL;
}
......@@ -232,7 +232,7 @@ static HRESULT WINAPI InPlaceSite_GetWindowContext(IOleInPlaceSite *iface,
static HRESULT WINAPI InPlaceSite_Scroll(IOleInPlaceSite *iface, SIZE scrollExtent)
{
DocHost *This = INPLACESITE_THIS(iface);
FIXME("(%p)->({%ld %ld})\n", This, scrollExtent.cx, scrollExtent.cy);
FIXME("(%p)->({%d %d})\n", This, scrollExtent.cx, scrollExtent.cy);
return E_NOTIMPL;
}
......@@ -384,7 +384,7 @@ static HRESULT WINAPI ClDispatch_GetTypeInfo(IDispatch *iface, UINT iTInfo, LCID
{
DocHost *This = DISP_THIS(iface);
TRACE("(%p)->(%u %ld %p)\n", This, iTInfo, lcid, ppTInfo);
TRACE("(%p)->(%u %d %p)\n", This, iTInfo, lcid, ppTInfo);
return E_NOTIMPL;
}
......@@ -394,7 +394,7 @@ static HRESULT WINAPI ClDispatch_GetIDsOfNames(IDispatch *iface, REFIID riid, LP
{
DocHost *This = DISP_THIS(iface);
TRACE("(%p)->(%s %p %u %ld %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
TRACE("(%p)->(%s %p %u %d %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
lcid, rgDispId);
return E_NOTIMPL;
......@@ -405,7 +405,7 @@ static HRESULT WINAPI ClDispatch_Invoke(IDispatch *iface, DISPID dispIdMember, R
VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr)
{
DocHost *This = DISP_THIS(iface);
FIXME("(%p)->(%ld %s %ld %04x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
FIXME("(%p)->(%d %s %d %04x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
return E_NOTIMPL;
}
......
dlls/shdocvw/dochost.c
View file @ e5f2f651
......@@ -92,7 +92,7 @@ static LRESULT resize_document(DocHost *This, LONG width, LONG height)
{
RECT rect = {0, 0, width, height};
TRACE("(%p)->(%ld %ld)\n", This, width, height);
TRACE("(%p)->(%d %d)\n", This, width, height);
if(This->view)
IOleDocumentView_SetRect(This->view, &rect);
......@@ -231,7 +231,7 @@ static HRESULT WINAPI ClOleCommandTarget_QueryStatus(IOleCommandTarget *iface,
const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[], OLECMDTEXT *pCmdText)
{
DocHost *This = OLECMD_THIS(iface);
FIXME("(%p)->(%s %lu %p %p)\n", This, debugstr_guid(pguidCmdGroup), cCmds, prgCmds,
FIXME("(%p)->(%s %u %p %p)\n", This, debugstr_guid(pguidCmdGroup), cCmds, prgCmds,
pCmdText);
return E_NOTIMPL;
}
......@@ -241,7 +241,7 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface,
VARIANT *pvaOut)
{
DocHost *This = OLECMD_THIS(iface);
FIXME("(%p)->(%s %ld %ld %p %p)\n", This, debugstr_guid(pguidCmdGroup), nCmdID,
FIXME("(%p)->(%s %d %d %p %p)\n", This, debugstr_guid(pguidCmdGroup), nCmdID,
nCmdexecopt, pvaIn, pvaOut);
return E_NOTIMPL;
}
......@@ -283,7 +283,7 @@ static HRESULT WINAPI DocHostUIHandler_ShowContextMenu(IDocHostUIHandler2 *iface
DocHost *This = DOCHOSTUI_THIS(iface);
HRESULT hres;
TRACE("(%p)->(%ld %p %p %p)\n", This, dwID, ppt, pcmdtReserved, pdispReserved);
TRACE("(%p)->(%d %p %p %p)\n", This, dwID, ppt, pcmdtReserved, pdispReserved);
if(This->hostui) {
hres = IDocHostUIHandler_ShowContextMenu(This->hostui, dwID, ppt, pcmdtReserved,
......@@ -321,7 +321,7 @@ static HRESULT WINAPI DocHostUIHandler_ShowUI(IDocHostUIHandler2 *iface, DWORD d
IOleInPlaceFrame *pFrame, IOleInPlaceUIWindow *pDoc)
{
DocHost *This = DOCHOSTUI_THIS(iface);
FIXME("(%p)->(%ld %p %p %p %p)\n", This, dwID, pActiveObject, pCommandTarget,
FIXME("(%p)->(%d %p %p %p %p)\n", This, dwID, pActiveObject, pCommandTarget,
pFrame, pDoc);
return E_NOTIMPL;
}
......@@ -376,7 +376,7 @@ static HRESULT WINAPI DocHostUIHandler_TranslateAccelerator(IDocHostUIHandler2 *
LPMSG lpMsg, const GUID *pguidCmdGroup, DWORD nCmdID)
{
DocHost *This = DOCHOSTUI_THIS(iface);
FIXME("(%p)->(%p %p %ld)\n", This, lpMsg, pguidCmdGroup, nCmdID);
FIXME("(%p)->(%p %p %d)\n", This, lpMsg, pguidCmdGroup, nCmdID);
return E_NOTIMPL;
}
......@@ -385,7 +385,7 @@ static HRESULT WINAPI DocHostUIHandler_GetOptionKeyPath(IDocHostUIHandler2 *ifac
{
DocHost *This = DOCHOSTUI_THIS(iface);
TRACE("(%p)->(%p %ld)\n", This, pchKey, dw);
TRACE("(%p)->(%p %d)\n", This, pchKey, dw);
if(This->hostui)
return IDocHostUIHandler_GetOptionKeyPath(This->hostui, pchKey, dw);
......@@ -414,7 +414,7 @@ static HRESULT WINAPI DocHostUIHandler_TranslateUrl(IDocHostUIHandler2 *iface,
{
DocHost *This = DOCHOSTUI_THIS(iface);
TRACE("(%p)->(%ld %s %p)\n", This, dwTranslate, debugstr_w(pchURLIn), ppchURLOut);
TRACE("(%p)->(%d %s %p)\n", This, dwTranslate, debugstr_w(pchURLIn), ppchURLOut);
if(This->hostui)
return IDocHostUIHandler_TranslateUrl(This->hostui, dwTranslate,
......@@ -438,7 +438,7 @@ static HRESULT WINAPI DocHostUIHandler_GetOverrideKeyPath(IDocHostUIHandler2 *if
IDocHostUIHandler2 *handler;
HRESULT hres;
TRACE("(%p)->(%p %ld)\n", This, pchKey, dw);
TRACE("(%p)->(%p %d)\n", This, pchKey, dw);
if(!This->hostui)
return S_OK;
......
dlls/shdocvw/events.c
View file @ e5f2f651
......@@ -224,7 +224,7 @@ static HRESULT WINAPI ConnectionPoint_Unadvise(IConnectionPoint *iface, DWORD dw
{
ConnectionPoint *This = CONPOINT_THIS(iface);
TRACE("(%p)->(%ld)\n", This, dwCookie);
TRACE("(%p)->(%d)\n", This, dwCookie);
if(!dwCookie || dwCookie > This->sinks_size || !This->sinks[dwCookie-1])
return CONNECT_E_NOCONNECTION;
......
dlls/shdocvw/factory.c
View file @ e5f2f651
......@@ -149,7 +149,7 @@ HRESULT register_class_object(BOOL do_reg)
hres = CoRegisterClassObject(&CLSID_InternetExplorer, (IUnknown*)FACTORY(&IEClassFactory),
CLSCTX_SERVER, REGCLS_MULTIPLEUSE|REGCLS_SUSPENDED, &cookie);
if (FAILED(hres)) {
ERR("failed to register object %08lx\n", hres);
ERR("failed to register object %08x\n", hres);
return hres;
}
......@@ -157,7 +157,7 @@ HRESULT register_class_object(BOOL do_reg)
if(SUCCEEDED(hres))
return hres;
ERR("failed to resume object %08lx\n", hres);
ERR("failed to resume object %08x\n", hres);
}
return CoRevokeClassObject(cookie);
......
dlls/shdocvw/ie.c
View file @ e5f2f651
......@@ -62,7 +62,7 @@ static ULONG WINAPI InternetExplorer_AddRef(IWebBrowser2 *iface)
{
InternetExplorer *This = WEBBROWSER_THIS(iface);
LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%ld\n", This, ref);
TRACE("(%p) ref=%d\n", This, ref);
return ref;
}
......@@ -71,7 +71,7 @@ static ULONG WINAPI InternetExplorer_Release(IWebBrowser2 *iface)
InternetExplorer *This = WEBBROWSER_THIS(iface);
LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%ld\n", This, ref);
TRACE("(%p) ref=%d\n", This, ref);
if(!ref) {
DocHost_Release(&This->doc_host);
......@@ -92,7 +92,7 @@ static HRESULT WINAPI InternetExplorer_GetTypeInfo(IWebBrowser2 *iface, UINT iTI
LPTYPEINFO *ppTInfo)
{
InternetExplorer *This = WEBBROWSER_THIS(iface);
FIXME("(%p)->(%d %ld %p)\n", This, iTInfo, lcid, ppTInfo);
FIXME("(%p)->(%d %d %p)\n", This, iTInfo, lcid, ppTInfo);
return E_NOTIMPL;
}
......@@ -101,7 +101,7 @@ static HRESULT WINAPI InternetExplorer_GetIDsOfNames(IWebBrowser2 *iface, REFIID
LCID lcid, DISPID *rgDispId)
{
InternetExplorer *This = WEBBROWSER_THIS(iface);
FIXME("(%p)->(%s %p %d %ld %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
FIXME("(%p)->(%s %p %d %d %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
lcid, rgDispId);
return E_NOTIMPL;
}
......@@ -112,7 +112,7 @@ static HRESULT WINAPI InternetExplorer_Invoke(IWebBrowser2 *iface, DISPID dispId
EXCEPINFO *pExepInfo, UINT *puArgErr)
{
InternetExplorer *This = WEBBROWSER_THIS(iface);
FIXME("(%p)->(%ld %s %ld %08x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
FIXME("(%p)->(%d %s %d %08x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr);
return E_NOTIMPL;
}
......
dlls/shdocvw/navigate.c
View file @ e5f2f651
......@@ -61,15 +61,15 @@ static void dump_BINDINFO(BINDINFO *bi)
TRACE("\n"
"BINDINFO = {\n"
" %ld, %s,\n"
" {%ld, %p, %p},\n"
" %d, %s,\n"
" {%d, %p, %p},\n"
" %s,\n"
" %s,\n"
" %s,\n"
" %ld, %08lx, %ld, %ld\n"
" {%ld %p %x},\n"
" %d, %08x, %d, %d\n"
" {%d %p %x},\n"
" %s\n"
" %p, %ld\n"
" %p, %d\n"
"}\n",
bi->cbSize, debugstr_w(bi->szExtraInfo),
......@@ -122,7 +122,7 @@ static ULONG WINAPI BindStatusCallback_AddRef(IBindStatusCallback *iface)
BindStatusCallback *This = BINDSC_THIS(iface);
LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%ld\n", This, ref);
TRACE("(%p) ref=%d\n", This, ref);
return ref;
}
......@@ -132,7 +132,7 @@ static ULONG WINAPI BindStatusCallback_Release(IBindStatusCallback *iface)
BindStatusCallback *This = BINDSC_THIS(iface);
LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%ld\n", This, ref);
TRACE("(%p) ref=%d\n", This, ref);
if(!ref) {
if(This->post_data)
......@@ -148,7 +148,7 @@ static HRESULT WINAPI BindStatusCallback_OnStartBinding(IBindStatusCallback *ifa
DWORD dwReserved, IBinding *pbind)
{
BindStatusCallback *This = BINDSC_THIS(iface);
FIXME("(%p)->(%ld %p)\n", This, dwReserved, pbind);
FIXME("(%p)->(%d %p)\n", This, dwReserved, pbind);
return E_NOTIMPL;
}
......@@ -164,7 +164,7 @@ static HRESULT WINAPI BindStatusCallback_OnLowResource(IBindStatusCallback *ifac
DWORD reserved)
{
BindStatusCallback *This = BINDSC_THIS(iface);
FIXME("(%p)->(%ld)\n", This, reserved);
FIXME("(%p)->(%d)\n", This, reserved);
return E_NOTIMPL;
}
......@@ -172,7 +172,7 @@ static HRESULT WINAPI BindStatusCallback_OnProgress(IBindStatusCallback *iface,
ULONG ulProgress, ULONG ulProgressMax, ULONG ulStatusCode, LPCWSTR szStatusText)
{
BindStatusCallback *This = BINDSC_THIS(iface);
FIXME("(%p)->(%ld %ld %ld %s)\n", This, ulProgress, ulProgressMax, ulStatusCode,
FIXME("(%p)->(%d %d %d %s)\n", This, ulProgress, ulProgressMax, ulStatusCode,
debugstr_w(szStatusText));
return E_NOTIMPL;
}
......@@ -181,7 +181,7 @@ static HRESULT WINAPI BindStatusCallback_OnStopBinding(IBindStatusCallback *ifac
HRESULT hresult, LPCWSTR szError)
{
BindStatusCallback *This = BINDSC_THIS(iface);
FIXME("(%p)->(%08lx %s)\n", This, hresult, debugstr_w(szError));
FIXME("(%p)->(%08x %s)\n", This, hresult, debugstr_w(szError));
return E_NOTIMPL;
}
......@@ -213,7 +213,7 @@ static HRESULT WINAPI BindStatusCallback_OnDataAvailable(IBindStatusCallback *if
DWORD grfBSCF, DWORD dwSize, FORMATETC *pformatetc, STGMEDIUM *pstgmed)
{
BindStatusCallback *This = BINDSC_THIS(iface);
FIXME("(%p)->(%08lx %ld %p %p)\n", This, grfBSCF, dwSize, pformatetc, pstgmed);
FIXME("(%p)->(%08x %d %p %p)\n", This, grfBSCF, dwSize, pformatetc, pstgmed);
return E_NOTIMPL;
}
......@@ -258,7 +258,7 @@ static HRESULT WINAPI HttpNegotiate_BeginningTransaction(IHttpNegotiate *iface,
{
BindStatusCallback *This = HTTPNEG_THIS(iface);
FIXME("(%p)->(%s %s %ld %p)\n", This, debugstr_w(szURL), debugstr_w(szHeaders),
FIXME("(%p)->(%s %s %d %p)\n", This, debugstr_w(szURL), debugstr_w(szHeaders),
dwReserved, pszAdditionalHeaders);
if(This->headers) {
......@@ -275,7 +275,7 @@ static HRESULT WINAPI HttpNegotiate_OnResponse(IHttpNegotiate *iface,
LPWSTR *pszAdditionalRequestHeaders)
{
BindStatusCallback *This = HTTPNEG_THIS(iface);
FIXME("(%p)->(%ld %s %s %p)\n", This, dwResponseCode, debugstr_w(szResponseHeaders),
FIXME("(%p)->(%d %s %s %p)\n", This, dwResponseCode, debugstr_w(szResponseHeaders),
debugstr_w(szRequestHeaders), pszAdditionalRequestHeaders);
return E_NOTIMPL;
}
......@@ -443,7 +443,7 @@ static HRESULT navigate(DocHost *This, IMoniker *mon, IBindCtx *bindctx,
&IID_IUnknown, (void**)&This->document);
if(FAILED(hres)) {
ERR("Could not create HTMLDocument: %08lx\n", hres);
ERR("Could not create HTMLDocument: %08x\n", hres);
return hres;
}
......@@ -459,7 +459,7 @@ static HRESULT navigate(DocHost *This, IMoniker *mon, IBindCtx *bindctx,
hres = IPersistMoniker_Load(persist, FALSE, mon, bindctx, 0);
IPersistMoniker_Release(persist);
if(FAILED(hres)) {
WARN("Load failed: %08lx\n", hres);
WARN("Load failed: %08x\n", hres);
return hres;
}
......@@ -490,7 +490,7 @@ HRESULT navigate_url(DocHost *This, LPCWSTR url, PBYTE post_data, ULONG post_dat
hres = CreateURLMoniker(NULL, url, &mon);
if(FAILED(hres)) {
WARN("CreateURLMoniker failed: %08lx\n", hres);
WARN("CreateURLMoniker failed: %08x\n", hres);
return hres;
}
......@@ -607,10 +607,10 @@ static HRESULT WINAPI HlinkFrame_Navigate(IHlinkFrame *iface, DWORD grfHLNF, LPB
IMoniker *mon;
LPWSTR location = NULL;
TRACE("(%p)->(%08lx %p %p %p)\n", This, grfHLNF, pbc, pibsc, pihlNavigate);
TRACE("(%p)->(%08x %p %p %p)\n", This, grfHLNF, pbc, pibsc, pihlNavigate);
if(grfHLNF)
FIXME("unsupported grfHLNF=%08lx\n", grfHLNF);
FIXME("unsupported grfHLNF=%08x\n", grfHLNF);
/* Windows calls GetTargetFrameName here. */
......@@ -635,7 +635,7 @@ static HRESULT WINAPI HlinkFrame_OnNavigate(IHlinkFrame *iface, DWORD grfHLNF,
IMoniker *pimkTarget, LPCWSTR pwzLocation, LPCWSTR pwzFriendlyName, DWORD dwreserved)
{
WebBrowser *This = HLINKFRAME_THIS(iface);
FIXME("(%p)->(%08lx %p %s %s %ld)\n", This, grfHLNF, pimkTarget, debugstr_w(pwzLocation),
FIXME("(%p)->(%08x %p %s %s %d)\n", This, grfHLNF, pimkTarget, debugstr_w(pwzLocation),
debugstr_w(pwzFriendlyName), dwreserved);
return E_NOTIMPL;
}
......@@ -644,7 +644,7 @@ static HRESULT WINAPI HlinkFrame_UpdateHlink(IHlinkFrame *iface, ULONG uHLID,
IMoniker *pimkTarget, LPCWSTR pwzLocation, LPCWSTR pwzFriendlyName)
{
WebBrowser *This = HLINKFRAME_THIS(iface);
FIXME("(%p)->(%lu %p %s %s)\n", This, uHLID, pimkTarget, debugstr_w(pwzLocation),
FIXME("(%p)->(%u %p %s %s)\n", This, uHLID, pimkTarget, debugstr_w(pwzLocation),
debugstr_w(pwzFriendlyName));
return E_NOTIMPL;
}
......
dlls/shdocvw/oleobject.c
View file @ e5f2f651
......@@ -119,7 +119,7 @@ static HRESULT activate_inplace(WebBrowser *This, IOleClientSite *active_site, H
hres = IOleInPlaceSite_CanInPlaceActivate(This->inplace);
if(hres != S_OK) {
WARN("CanInPlaceActivate returned: %08lx\n", hres);
WARN("CanInPlaceActivate returned: %08x\n", hres);
IOleInPlaceSite_Release(This->inplace);
return E_FAIL;
}
......@@ -294,14 +294,14 @@ static HRESULT WINAPI OleObject_SetHostNames(IOleObject *iface, LPCOLESTR szCont
static HRESULT WINAPI OleObject_Close(IOleObject *iface, DWORD dwSaveOption)
{
WebBrowser *This = OLEOBJ_THIS(iface);
FIXME("(%p)->(%ld)\n", This, dwSaveOption);
FIXME("(%p)->(%d)\n", This, dwSaveOption);
return E_NOTIMPL;
}
static HRESULT WINAPI OleObject_SetMoniker(IOleObject *iface, DWORD dwWhichMoniker, IMoniker* pmk)
{
WebBrowser *This = OLEOBJ_THIS(iface);
FIXME("(%p)->(%ld, %p)\n", This, dwWhichMoniker, pmk);
FIXME("(%p)->(%d, %p)\n", This, dwWhichMoniker, pmk);
return E_NOTIMPL;
}
......@@ -309,7 +309,7 @@ static HRESULT WINAPI OleObject_GetMoniker(IOleObject *iface, DWORD dwAssign,
DWORD dwWhichMoniker, LPMONIKER *ppmk)
{
WebBrowser *This = OLEOBJ_THIS(iface);
FIXME("(%p)->(%ld, %ld, %p)\n", This, dwAssign, dwWhichMoniker, ppmk);
FIXME("(%p)->(%d, %d, %p)\n", This, dwAssign, dwWhichMoniker, ppmk);
return E_NOTIMPL;
}
......@@ -317,7 +317,7 @@ static HRESULT WINAPI OleObject_InitFromData(IOleObject *iface, LPDATAOBJECT pDa
BOOL fCreation, DWORD dwReserved)
{
WebBrowser *This = OLEOBJ_THIS(iface);
FIXME("(%p)->(%p, %d, %ld)\n", This, pDataObject, fCreation, dwReserved);
FIXME("(%p)->(%p, %d, %d)\n", This, pDataObject, fCreation, dwReserved);
return E_NOTIMPL;
}
......@@ -325,7 +325,7 @@ static HRESULT WINAPI OleObject_GetClipboardData(IOleObject *iface, DWORD dwRese
LPDATAOBJECT *ppDataObject)
{
WebBrowser *This = OLEOBJ_THIS(iface);
FIXME("(%p)->(%ld, %p)\n", This, dwReserved, ppDataObject);
FIXME("(%p)->(%d, %p)\n", This, dwReserved, ppDataObject);
return E_NOTIMPL;
}
......@@ -334,7 +334,7 @@ static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, struct tag
{
WebBrowser *This = OLEOBJ_THIS(iface);
TRACE("(%p)->(%ld %p %p %ld %p %p)\n", This, iVerb, lpmsg, pActiveSite, lindex, hwndParent,
TRACE("(%p)->(%d %p %p %d %p %p)\n", This, iVerb, lpmsg, pActiveSite, lindex, hwndParent,
lprcPosRect);
switch (iVerb)
......@@ -349,7 +349,7 @@ static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, struct tag
TRACE("OLEIVERB_INPLACEACTIVATE\n");
return activate_inplace(This, pActiveSite, hwndParent);
default:
FIXME("stub for %ld\n", iVerb);
FIXME("stub for %d\n", iVerb);
break;
}
......@@ -388,7 +388,7 @@ static HRESULT WINAPI OleObject_GetUserType(IOleObject *iface, DWORD dwFormOfTyp
LPOLESTR* pszUserType)
{
WebBrowser *This = OLEOBJ_THIS(iface);
TRACE("(%p, %ld, %p)\n", This, dwFormOfType, pszUserType);
TRACE("(%p, %d, %p)\n", This, dwFormOfType, pszUserType);
return OleRegGetUserType(&CLSID_WebBrowser, dwFormOfType, pszUserType);
}
......@@ -396,7 +396,7 @@ static HRESULT WINAPI OleObject_SetExtent(IOleObject *iface, DWORD dwDrawAspect,
{
WebBrowser *This = OLEOBJ_THIS(iface);
TRACE("(%p)->(%lx %p)\n", This, dwDrawAspect, psizel);
TRACE("(%p)->(%x %p)\n", This, dwDrawAspect, psizel);
/* Tests show that dwDrawAspect is ignored */
memcpy(&This->extent, psizel, sizeof(SIZEL));
......@@ -407,7 +407,7 @@ static HRESULT WINAPI OleObject_GetExtent(IOleObject *iface, DWORD dwDrawAspect,
{
WebBrowser *This = OLEOBJ_THIS(iface);
TRACE("(%p)->(%lx, %p)\n", This, dwDrawAspect, psizel);
TRACE("(%p)->(%x, %p)\n", This, dwDrawAspect, psizel);
/* Tests show that dwDrawAspect is ignored */
memcpy(psizel, &This->extent, sizeof(SIZEL));
......@@ -425,7 +425,7 @@ static HRESULT WINAPI OleObject_Advise(IOleObject *iface, IAdviseSink *pAdvSink,
static HRESULT WINAPI OleObject_Unadvise(IOleObject *iface, DWORD dwConnection)
{
WebBrowser *This = OLEOBJ_THIS(iface);
FIXME("(%p)->(%ld)\n", This, dwConnection);
FIXME("(%p)->(%d)\n", This, dwConnection);
return E_NOTIMPL;
}
......@@ -440,7 +440,7 @@ static HRESULT WINAPI OleObject_GetMiscStatus(IOleObject *iface, DWORD dwAspect,
{
WebBrowser *This = OLEOBJ_THIS(iface);
TRACE("(%p)->(%lx, %p)\n", This, dwAspect, pdwStatus);
TRACE("(%p)->(%x, %p)\n", This, dwAspect, pdwStatus);
*pdwStatus = OLEMISC_SETCLIENTSITEFIRST|OLEMISC_ACTIVATEWHENVISIBLE|OLEMISC_INSIDEOUT
|OLEMISC_CANTLINKINSIDE|OLEMISC_RECOMPOSEONRESIZE;
......@@ -632,7 +632,7 @@ static HRESULT WINAPI OleControl_OnMnemonic(IOleControl *iface, struct tagMSG *p
static HRESULT WINAPI OleControl_OnAmbientPropertyChange(IOleControl *iface, DISPID dispID)
{
WebBrowser *This = CONTROL_THIS(iface);
FIXME("(%p)->(%ld)\n", This, dispID);
FIXME("(%p)->(%d)\n", This, dispID);
return E_NOTIMPL;
}
......@@ -771,7 +771,7 @@ static HRESULT WINAPI WBOleCommandTarget_QueryStatus(IOleCommandTarget *iface,
const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[], OLECMDTEXT *pCmdText)
{
WebBrowser *This = OLECMD_THIS(iface);
FIXME("(%p)->(%s %lu %p %p)\n", This, debugstr_guid(pguidCmdGroup), cCmds, prgCmds,
FIXME("(%p)->(%s %u %p %p)\n", This, debugstr_guid(pguidCmdGroup), cCmds, prgCmds,
pCmdText);
return E_NOTIMPL;
}
......@@ -781,7 +781,7 @@ static HRESULT WINAPI WBOleCommandTarget_Exec(IOleCommandTarget *iface,
VARIANT *pvaOut)
{
WebBrowser *This = OLECMD_THIS(iface);
FIXME("(%p)->(%s %ld %ld %p %p)\n", This, debugstr_guid(pguidCmdGroup), nCmdID,
FIXME("(%p)->(%s %d %d %p %p)\n", This, debugstr_guid(pguidCmdGroup), nCmdID,
nCmdexecopt, pvaIn, pvaOut);
return E_NOTIMPL;
}
......
dlls/shdocvw/regsvr.c
View file @ e5f2f651
......@@ -735,7 +735,7 @@ static HRESULT register_typelib(void)
hres = LoadTypeLibEx(wszSHDocVw, REGKIND_REGISTER, &typelib);
if(FAILED(hres)) {
ERR("Could not load typelib: %08lx\n", hres);
ERR("Could not load typelib: %08x\n", hres);
return hres;
}
......
dlls/shdocvw/shdocvw_main.c
View file @ e5f2f651
......@@ -54,7 +54,7 @@ HRESULT get_typeinfo(ITypeInfo **typeinfo)
hres = LoadRegTypeLib(&LIBID_SHDocVw, 1, 1, LOCALE_SYSTEM_DEFAULT, &typelib);
if(FAILED(hres)) {
ERR("LoadRegTypeLib failed: %08lx\n", hres);
ERR("LoadRegTypeLib failed: %08x\n", hres);
return hres;
}
......@@ -70,7 +70,7 @@ HRESULT get_typeinfo(ITypeInfo **typeinfo)
*/
BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad)
{
TRACE("%p 0x%lx %p\n", hinst, fdwReason, fImpLoad);
TRACE("%p 0x%x %p\n", hinst, fdwReason, fImpLoad);
switch (fdwReason)
{
case DLL_PROCESS_ATTACH:
......@@ -187,7 +187,7 @@ DWORD WINAPI RunInstallUninstallStubs(void)
*/
DWORD WINAPI SetQueryNetSessionCount(DWORD arg)
{
FIXME("(%lu), stub!\n", arg);
FIXME("(%u), stub!\n", arg);
return 0;
}
......
dlls/shdocvw/shlinstobj.c
View file @ e5f2f651
......@@ -275,14 +275,14 @@ static HRESULT WINAPI InstanceObjectFactory_IClassFactory_CreateInstance(IClassF
hr = CoCreateInstance(&This->m_clsidInstance, NULL, CLSCTX_INPROC_SERVER,
&IID_IPersistPropertyBag, (LPVOID*)&pPersistPropertyBag);
if (FAILED(hr)) {
TRACE("Failed to create instance of %s. hr = %08lx\n",
TRACE("Failed to create instance of %s. hr = %08x\n",
debugstr_guid(&This->m_clsidInstance), hr);
return hr;
}
hr = IPersistPropertyBag_Load(pPersistPropertyBag, This->m_pPropertyBag, NULL);
if (FAILED(hr)) {
TRACE("Failed to initialize object from ProperyBag: hr = %08lx\n", hr);
TRACE("Failed to initialize object from ProperyBag: hr = %08x\n", hr);
IPersistPropertyBag_Release(pPersistPropertyBag);
return hr;
}
......
dlls/shdocvw/view.c
View file @ e5f2f651
......@@ -48,7 +48,7 @@ static HRESULT WINAPI ViewObject_Draw(IViewObject2 *iface, DWORD dwDrawAspect,
ULONG_PTR dwContinue)
{
WebBrowser *This = VIEWOBJ_THIS(iface);
FIXME("(%p)->(%ld %ld %p %p %p %p %p %p %p %08lx)\n", This, dwDrawAspect, lindex,
FIXME("(%p)->(%d %d %p %p %p %p %p %p %p %08lx)\n", This, dwDrawAspect, lindex,
pvAspect, ptd, hdcTargetDev, hdcDraw, lprcBounds, lprcWBounds, pfnContinue,
dwContinue);
return E_NOTIMPL;
......@@ -59,7 +59,7 @@ static HRESULT WINAPI ViewObject_GetColorSet(IViewObject2 *iface, DWORD dwAspect
LOGPALETTE **ppColorSet)
{
WebBrowser *This = VIEWOBJ_THIS(iface);
FIXME("(%p)->(%ld %ld %p %p %p %p)\n", This, dwAspect, lindex, pvAspect, ptd,
FIXME("(%p)->(%d %d %p %p %p %p)\n", This, dwAspect, lindex, pvAspect, ptd,
hicTargetDev, ppColorSet);
return E_NOTIMPL;
}
......@@ -68,14 +68,14 @@ static HRESULT WINAPI ViewObject_Freeze(IViewObject2 *iface, DWORD dwDrawAspect,
void *pvAspect, DWORD *pdwFreeze)
{
WebBrowser *This = VIEWOBJ_THIS(iface);
FIXME("(%p)->(%ld %ld %p %p)\n", This, dwDrawAspect, lindex, pvAspect, pdwFreeze);
FIXME("(%p)->(%d %d %p %p)\n", This, dwDrawAspect, lindex, pvAspect, pdwFreeze);
return E_NOTIMPL;
}
static HRESULT WINAPI ViewObject_Unfreeze(IViewObject2 *iface, DWORD dwFreeze)
{
WebBrowser *This = VIEWOBJ_THIS(iface);
FIXME("(%p)->(%ld)\n", This, dwFreeze);
FIXME("(%p)->(%d)\n", This, dwFreeze);
return E_NOTIMPL;
}
......@@ -83,7 +83,7 @@ static HRESULT WINAPI ViewObject_SetAdvise(IViewObject2 *iface, DWORD aspects, D
IAdviseSink *pAdvSink)
{
WebBrowser *This = VIEWOBJ_THIS(iface);
FIXME("(%p)->(%ld %08lx %p)\n", This, aspects, advf, pAdvSink);
FIXME("(%p)->(%d %08x %p)\n", This, aspects, advf, pAdvSink);
return E_NOTIMPL;
}
......@@ -99,7 +99,7 @@ static HRESULT WINAPI ViewObject_GetExtent(IViewObject2 *iface, DWORD dwAspect,
DVTARGETDEVICE *ptd, LPSIZEL lpsizel)
{
WebBrowser *This = VIEWOBJ_THIS(iface);
FIXME("(%p)->(%ld %ld %p %p)\n", This, dwAspect, lindex, ptd, lpsizel);
FIXME("(%p)->(%d %d %p %p)\n", This, dwAspect, lindex, ptd, lpsizel);
return E_NOTIMPL;
}
......
dlls/shdocvw/webbrowser.c
View file @ e5f2f651
......@@ -120,7 +120,7 @@ static ULONG WINAPI WebBrowser_AddRef(IWebBrowser2 *iface)
{
WebBrowser *This = WEBBROWSER_THIS(iface);
LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%ld\n", This, ref);
TRACE("(%p) ref=%d\n", This, ref);
return ref;
}
......@@ -129,7 +129,7 @@ static ULONG WINAPI WebBrowser_Release(IWebBrowser2 *iface)
WebBrowser *This = WEBBROWSER_THIS(iface);
LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%ld\n", This, ref);
TRACE("(%p) ref=%d\n", This, ref);
if(!ref) {
if(This->doc_host.document)
......@@ -158,7 +158,7 @@ static HRESULT WINAPI WebBrowser_GetTypeInfo(IWebBrowser2 *iface, UINT iTInfo, L
LPTYPEINFO *ppTInfo)
{
WebBrowser *This = WEBBROWSER_THIS(iface);
FIXME("(%p)->(%d %ld %p)\n", This, iTInfo, lcid, ppTInfo);
FIXME("(%p)->(%d %d %p)\n", This, iTInfo, lcid, ppTInfo);
return E_NOTIMPL;
}
......@@ -167,7 +167,7 @@ static HRESULT WINAPI WebBrowser_GetIDsOfNames(IWebBrowser2 *iface, REFIID riid,
LCID lcid, DISPID *rgDispId)
{
WebBrowser *This = WEBBROWSER_THIS(iface);
FIXME("(%p)->(%s %p %d %ld %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
FIXME("(%p)->(%s %p %d %d %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
lcid, rgDispId);
return E_NOTIMPL;
}
......@@ -181,7 +181,7 @@ static HRESULT WINAPI WebBrowser_Invoke(IWebBrowser2 *iface, DISPID dispIdMember
ITypeInfo *typeinfo;
HRESULT hres;
TRACE("(%p)->(%ld %s %ld %08x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
TRACE("(%p)->(%d %s %d %08x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr);
hres = get_typeinfo(&typeinfo);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment