hlink: Win64 printf format warning fixes.

dlls/hlink/Makefile.in

@@ -7,7 +7,6 @@ IMPORTS   = shell32 ole32 advapi32 kernel32
 IMPORTLIB = libhlink.$(IMPLIBEXT)
 DELAYIMPORTS = urlmon
 EXTRALIBS = -luuid
-EXTRADEFS = -DWINE_NO_LONG_AS_INT
 
 C_SRCS = \
 	browse_ctx.c \

dlls/hlink/browse_ctx.c

@@ -91,7 +91,7 @@ static ULONG WINAPI IHlinkBC_fnAddRef (IHlinkBrowseContext* iface)
     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 (IHlinkBrowseContext* iface)
     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(IHlinkBrowseContext* iface,
     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(IHlinkBrowseContext* iface,
     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_OnNavigateHlink(IHlinkBrowseContext *iface,
 {
     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;

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( IMoniker *pimkTrgt, LPCWSTR pwzLocation,
     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( IMoniker *pimkTrgt, LPCWSTR pwzLocation,
 
     *ppvObj = hl;
 
-    TRACE("Returning %li\n",r);
+    TRACE("Returning %i\n",r);
 
     return r;
 }
@@ -111,7 +111,7 @@ HRESULT WINAPI HlinkCreateFromString( LPCWSTR pwzTarget, LPCWSTR pwzLocation,
     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( LPCWSTR pwzTarget, LPCWSTR pwzLocation,
     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( IUnknown* piunkOuter, REFIID riid, void
 
     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, IHlinkFrame *phlFrame,
 {
     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( IHlinkFrame *phlFrame,
 {
     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(IDataObject *piDataObj,
         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 HlinkNavigateToStringReference( LPCWSTR pwzTarget,
     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 pwzFileName)
 
 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;
 }
 

dlls/hlink/link.c

@@ -167,7 +167,7 @@ static ULONG WINAPI IHlink_fnAddRef (IHlink* iface)
     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 (IHlink* iface)
     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_fnSetHlinkSite( IHlink* iface,
 {
     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_fnSetMonikerReference( IHlink* iface,
 {
     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_fnSetStringReference(IHlink* iface,
 {
     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_fnGetMonikerReference(IHlink* iface,
 {
     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_fnGetStringReference (IHlink* iface,
 {
     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_fnGetFriendlyName (IHlink* iface,
 {
     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(IHlink* iface, DWORD grfHLNF, LPBC pbc,
     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(IHlink* iface, DWORD grfHLNF, LPBC pbc,
 
         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_fnLoad(IPersistStream* iface,
     /* 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_fnSave(IPersistStream* iface,
         }
         IMoniker_Release(moniker);
     }
-    TRACE("Save Result 0x%lx\n", r);
+    TRACE("Save Result 0x%x\n", r);
 
     return r;
 }