hlink: Win64 printf format warning fixes.
Michael Stefaniuc
mstefani at redhat.de
Sun Oct 8 12:37:11 CDT 2006
---
dlls/hlink/Makefile.in | 1 -
dlls/hlink/browse_ctx.c | 10 +++++-----
dlls/hlink/hlink_main.c | 22 +++++++++++-----------
dlls/hlink/link.c | 24 ++++++++++++------------
4 files changed, 28 insertions(+), 29 deletions(-)
diff --git a/dlls/hlink/Makefile.in b/dlls/hlink/Makefile.in
index 9d8651c..d7ceff2 100644
--- a/dlls/hlink/Makefile.in
+++ b/dlls/hlink/Makefile.in
@@ -7,7 +7,6 @@ IMPORTS = shell32 ole32 advapi32 kerne
IMPORTLIB = libhlink.$(IMPLIBEXT)
DELAYIMPORTS = urlmon
EXTRALIBS = -luuid
-EXTRADEFS = -DWINE_NO_LONG_AS_INT
C_SRCS = \
browse_ctx.c \
diff --git a/dlls/hlink/browse_ctx.c b/dlls/hlink/browse_ctx.c
index 5658392..f36fd2f 100644
--- a/dlls/hlink/browse_ctx.c
+++ b/dlls/hlink/browse_ctx.c
@@ -91,7 +91,7 @@ static ULONG WINAPI IHlinkBC_fnAddRef (I
HlinkBCImpl *This = (HlinkBCImpl*)iface;
ULONG refCount = InterlockedIncrement(&This->ref);
- TRACE("(%p)->(count=%lu)\n", This, refCount - 1);
+ TRACE("(%p)->(count=%u)\n", This, refCount - 1);
return refCount;
}
@@ -101,7 +101,7 @@ static ULONG WINAPI IHlinkBC_fnRelease (
HlinkBCImpl *This = (HlinkBCImpl*)iface;
ULONG refCount = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(count=%lu)\n", This, refCount + 1);
+ TRACE("(%p)->(count=%u)\n", This, refCount + 1);
if (refCount)
return refCount;
@@ -122,7 +122,7 @@ static HRESULT WINAPI IHlinkBC_Register(
IMoniker *composite;
IRunningObjectTable *ROT;
- FIXME("(%p)->(%li %p %p %p)\n", This, dwReserved, piunk, pimk, pdwRegister);
+ FIXME("(%p)->(%i %p %p %p)\n", This, dwReserved, piunk, pimk, pdwRegister);
CreateItemMoniker(NULL, szIdent, &mon);
CreateGenericComposite(mon, pimk, &composite);
@@ -151,7 +151,7 @@ static HRESULT WINAPI IHlinkBC_Revoke(IH
IRunningObjectTable *ROT;
HlinkBCImpl *This = (HlinkBCImpl*)iface;
- FIXME("(%p)->(%li)\n", This, dwRegister);
+ FIXME("(%p)->(%i)\n", This, dwRegister);
GetRunningObjectTable(0, &ROT);
r = IRunningObjectTable_Revoke(ROT, dwRegister);
@@ -203,7 +203,7 @@ static HRESULT WINAPI IHlinkBC_OnNavigat
{
HlinkBCImpl *This = (HlinkBCImpl*)iface;
- FIXME("(%p)->(%li %p %s %s %p)\n", This, grfHLNF, pmkTarget,
+ FIXME("(%p)->(%i %p %s %s %p)\n", This, grfHLNF, pmkTarget,
debugstr_w(pwzLocation), debugstr_w(pwzFriendlyName), puHLID);
return S_OK;
diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c
index ec2c5d0..f0f0039 100644
--- a/dlls/hlink/hlink_main.c
+++ b/dlls/hlink/hlink_main.c
@@ -52,7 +52,7 @@ typedef struct
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{
- TRACE("%p %ld %p\n", hinstDLL, fdwReason, lpvReserved);
+ TRACE("%p %d %p\n", hinstDLL, fdwReason, lpvReserved);
switch (fdwReason)
{
@@ -80,7 +80,7 @@ HRESULT WINAPI HlinkCreateFromMoniker( I
IHlink *hl = NULL;
HRESULT r = S_OK;
- TRACE("%p %s %s %p %li %p %s %p\n", pimkTrgt, debugstr_w(pwzLocation),
+ TRACE("%p %s %s %p %i %p %s %p\n", pimkTrgt, debugstr_w(pwzLocation),
debugstr_w(pwzFriendlyName), pihlsite, dwSiteData, piunkOuter,
debugstr_guid(riid), ppvObj);
@@ -99,7 +99,7 @@ HRESULT WINAPI HlinkCreateFromMoniker( I
*ppvObj = hl;
- TRACE("Returning %li\n",r);
+ TRACE("Returning %i\n",r);
return r;
}
@@ -111,7 +111,7 @@ HRESULT WINAPI HlinkCreateFromString( LP
IHlink *hl = NULL;
HRESULT r = S_OK;
- TRACE("%s %s %s %p %li %p %s %p\n", debugstr_w(pwzTarget),
+ TRACE("%s %s %s %p %i %p %s %p\n", debugstr_w(pwzTarget),
debugstr_w(pwzLocation), debugstr_w(pwzFriendlyName), pihlsite,
dwSiteData, piunkOuter, debugstr_guid(riid), ppvObj);
@@ -154,7 +154,7 @@ HRESULT WINAPI HlinkCreateFromString( LP
if (pihlsite)
IHlink_SetHlinkSite(hl, pihlsite, dwSiteData);
- TRACE("Returning %li\n",r);
+ TRACE("Returning %i\n",r);
*ppvObj = hl;
return r;
@@ -169,7 +169,7 @@ HRESULT WINAPI HlinkCreateBrowseContext(
r = CoCreateInstance(&CLSID_StdHlinkBrowseContext, piunkOuter, CLSCTX_INPROC_SERVER, riid, ppvObj);
- TRACE("returning %li\n",r);
+ TRACE("returning %i\n",r);
return r;
}
@@ -180,7 +180,7 @@ HRESULT WINAPI HlinkNavigate(IHlink *phl
{
HRESULT r = S_OK;
- TRACE("%p %p %li %p %p %p\n", phl, phlFrame, grfHLNF, pbc, pbsc, phlbc);
+ TRACE("%p %p %i %p %p %p\n", phl, phlFrame, grfHLNF, pbc, pbsc, phlbc);
if (phlFrame)
r = IHlinkFrame_Navigate(phlFrame, grfHLNF, pbc, pbsc, phl);
@@ -196,7 +196,7 @@ HRESULT WINAPI HlinkOnNavigate( IHlinkFr
{
HRESULT r = S_OK;
- TRACE("%p %p %li %p %s %s %p\n",phlFrame, phlbc, grfHLNF, pmkTarget,
+ TRACE("%p %p %i %p %s %s %p\n",phlFrame, phlbc, grfHLNF, pmkTarget,
debugstr_w(pwzLocation), debugstr_w(pwzFriendlyName), puHLID);
r = IHlinkBrowseContext_OnNavigateHlink(phlbc, grfHLNF, pmkTarget,
@@ -213,7 +213,7 @@ HRESULT WINAPI HlinkCreateFromData(IData
IHlinkSite *pihlsite, DWORD dwSiteData, IUnknown *piunkOuter,
REFIID riid, void **ppvObj)
{
- FIXME("%p %p %ld %p %p %p\n",
+ FIXME("%p %p %d %p %p %p\n",
piDataObj, pihlsite, dwSiteData, piunkOuter, riid, ppvObj);
*ppvObj = NULL;
return E_NOTIMPL;
@@ -243,7 +243,7 @@ HRESULT WINAPI HlinkNavigateToStringRefe
HRESULT r;
IHlink *hlink = NULL;
- FIXME("%s %s %p %08lx %p %08lx %p %p %p\n",
+ FIXME("%s %s %p %08x %p %08x %p %p %p\n",
debugstr_w(pwzTarget), debugstr_w(pwzLocation), pihlsite,
dwSiteData, pihlframe, grfHLNF, pibc, pibsc, pihlbc);
@@ -275,7 +275,7 @@ HRESULT WINAPI HlinkIsShortcut(LPCWSTR p
HRESULT WINAPI HlinkTranslateURL(LPCWSTR pwzURL, DWORD grfFlags, LPWSTR *ppwzTranslatedURL)
{
- FIXME("(%s %08lx %p)\n", debugstr_w(pwzURL), grfFlags, ppwzTranslatedURL);
+ FIXME("(%s %08x %p)\n", debugstr_w(pwzURL), grfFlags, ppwzTranslatedURL);
return E_NOTIMPL;
}
diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c
index 4d3b074..4d86764 100644
--- a/dlls/hlink/link.c
+++ b/dlls/hlink/link.c
@@ -167,7 +167,7 @@ static ULONG WINAPI IHlink_fnAddRef (IHl
HlinkImpl *This = (HlinkImpl*)iface;
ULONG refCount = InterlockedIncrement(&This->ref);
- TRACE("(%p)->(count=%lu)\n", This, refCount - 1);
+ TRACE("(%p)->(count=%u)\n", This, refCount - 1);
return refCount;
}
@@ -177,7 +177,7 @@ static ULONG WINAPI IHlink_fnRelease (IH
HlinkImpl *This = (HlinkImpl*)iface;
ULONG refCount = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(count=%lu)\n", This, refCount + 1);
+ TRACE("(%p)->(count=%u)\n", This, refCount + 1);
if (refCount)
return refCount;
@@ -199,7 +199,7 @@ static HRESULT WINAPI IHlink_fnSetHlinkS
{
HlinkImpl *This = (HlinkImpl*)iface;
- TRACE("(%p)->(%p %li)\n", This, pihlSite, dwSiteData);
+ TRACE("(%p)->(%p %i)\n", This, pihlSite, dwSiteData);
if (This->Site)
IHlinkSite_Release(This->Site);
@@ -234,7 +234,7 @@ static HRESULT WINAPI IHlink_fnSetMonike
{
HlinkImpl *This = (HlinkImpl*)iface;
- FIXME("(%p)->(%li %p %s)\n", This, rfHLSETF, pmkTarget,
+ FIXME("(%p)->(%i %p %s)\n", This, rfHLSETF, pmkTarget,
debugstr_w(pwzLocation));
if (This->Moniker)
@@ -255,7 +255,7 @@ static HRESULT WINAPI IHlink_fnSetString
{
HlinkImpl *This = (HlinkImpl*)iface;
- TRACE("(%p)->(%li %s %s)\n", This, grfHLSETF, debugstr_w(pwzTarget),
+ TRACE("(%p)->(%i %s %s)\n", This, grfHLSETF, debugstr_w(pwzTarget),
debugstr_w(pwzLocation));
if (grfHLSETF & HLINKSETF_TARGET)
@@ -277,7 +277,7 @@ static HRESULT WINAPI IHlink_fnGetMonike
{
HlinkImpl *This = (HlinkImpl*)iface;
- TRACE("(%p) -> (%li %p %p)\n", This, dwWhichRef, ppimkTarget,
+ TRACE("(%p) -> (%i %p %p)\n", This, dwWhichRef, ppimkTarget,
ppwzLocation);
if(ppimkTarget)
@@ -294,7 +294,7 @@ static HRESULT WINAPI IHlink_fnGetString
{
HlinkImpl *This = (HlinkImpl*)iface;
- FIXME("(%p) -> (%li %p %p)\n", This, dwWhichRef, ppwzTarget, ppwzLocation);
+ FIXME("(%p) -> (%i %p %p)\n", This, dwWhichRef, ppwzTarget, ppwzLocation);
if (ppwzTarget)
{
@@ -345,7 +345,7 @@ static HRESULT WINAPI IHlink_fnGetFriend
{
HlinkImpl *This = (HlinkImpl*)iface;
- TRACE("(%p) -> (%li %p)\n", This, grfHLFNAMEF, ppwzFriendlyName);
+ TRACE("(%p) -> (%i %p)\n", This, grfHLFNAMEF, ppwzFriendlyName);
/* FIXME: Only using explicitly set and cached friendly names */
@@ -406,7 +406,7 @@ static HRESULT WINAPI IHlink_fnNavigate(
HlinkImpl *This = (HlinkImpl*)iface;
IMoniker *mon = NULL;
- FIXME("Semi-Stub:(%p)->(%li %p %p %p)\n", This, grfHLNF, pbc, pbsc, phbc);
+ FIXME("Semi-Stub:(%p)->(%i %p %p %p)\n", This, grfHLNF, pbc, pbsc, phbc);
if (This->Site)
IHlinkSite_ReadyToNavigate(This->Site, This->SiteData, 0);
@@ -426,7 +426,7 @@ static HRESULT WINAPI IHlink_fnNavigate(
r = IMoniker_BindToObject(mon, bcxt, NULL, &IID_IHlinkTarget,
(LPVOID*)&target);
- TRACE("IHlinkTarget returned 0x%lx\n", r);
+ TRACE("IHlinkTarget returned 0x%x\n", r);
if (r == S_OK)
{
IHlinkTarget_SetBrowseContext(target, phbc);
@@ -645,7 +645,7 @@ static HRESULT WINAPI IPersistStream_fnL
/* FIXME: unknown header values */
r = OleLoadFromStream(pStm, &IID_IMoniker, (LPVOID*)&(This->Moniker));
- TRACE("Load Result 0x%lx (%p)\n", r, This->Moniker);
+ TRACE("Load Result 0x%x (%p)\n", r, This->Moniker);
return r;
}
@@ -680,7 +680,7 @@ static HRESULT WINAPI IPersistStream_fnS
}
IMoniker_Release(moniker);
}
- TRACE("Save Result 0x%lx\n", r);
+ TRACE("Save Result 0x%x\n", r);
return r;
}
--
1.4.2.3
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20061008/f482269a/attachment-0001.pgp
More information about the wine-patches
mailing list