Skip to content

W
wine-cw
Commit 34a94ea3 authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard
Browse files
Options

hlink: Enable compilation with long types.

Signed-off-by: 's avatarEric Pouech <eric.pouech@gmail.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent de6f347b
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 48 deletions
dlls/hlink/Makefile.in
View file @ 34a94ea3
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = hlink.dll
IMPORTLIB = hlink
IMPORTS = uuid shell32 ole32 advapi32
......
dlls/hlink/browse_ctx.c
View file @ 34a94ea3
......@@ -68,7 +68,7 @@ static ULONG WINAPI IHlinkBC_fnAddRef (IHlinkBrowseContext* iface)
HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface);
ULONG refCount = InterlockedIncrement(&This->ref);
TRACE("(%p)->(count=%u)\n", This, refCount - 1);
TRACE("(%p)->(count=%lu)\n", This, refCount - 1);
return refCount;
}
......@@ -78,7 +78,7 @@ static ULONG WINAPI IHlinkBC_fnRelease (IHlinkBrowseContext* iface)
HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface);
ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p)->(count=%u)\n", This, ref + 1);
TRACE("(%p)->(count=%lu)\n", This, ref + 1);
if (!ref)
{
......@@ -107,7 +107,7 @@ static HRESULT WINAPI IHlinkBC_Register(IHlinkBrowseContext* iface,
IRunningObjectTable *ROT;
HRESULT hr;
FIXME("(%p)->(%i %p %p %p)\n", This, dwReserved, piunk, pimk, pdwRegister);
FIXME("(%p)->(%li %p %p %p)\n", This, dwReserved, piunk, pimk, pdwRegister);
hr = CreateItemMoniker(NULL, L"WINEHLINK", &mon);
if (FAILED(hr))
......@@ -156,7 +156,7 @@ static HRESULT WINAPI IHlinkBC_Revoke(IHlinkBrowseContext* iface,
IRunningObjectTable *ROT;
HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface);
FIXME("(%p)->(%i)\n", This, dwRegister);
FIXME("(%p)->(%li)\n", This, dwRegister);
GetRunningObjectTable(0, &ROT);
r = IRunningObjectTable_Revoke(ROT, dwRegister);
......@@ -226,7 +226,7 @@ static HRESULT WINAPI IHlinkBC_OnNavigateHlink(IHlinkBrowseContext *iface,
{
HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface);
FIXME("(%p)->(%i %p %s %s %p)\n", This, grfHLNF, pmkTarget,
FIXME("(%p)->(%li %p %s %s %p)\n", This, grfHLNF, pmkTarget,
debugstr_w(pwzLocation), debugstr_w(pwzFriendlyName), puHLID);
return S_OK;
......@@ -254,7 +254,7 @@ static struct link_entry *context_get_entry(HlinkBCImpl *ctxt, ULONG hlid)
entry = list_head(&ctxt->links);
break;
default:
WARN("unknown id 0x%x\n", hlid);
WARN("unknown id 0x%lx\n", hlid);
entry = NULL;
}
......@@ -269,7 +269,7 @@ static HRESULT WINAPI IHlinkBC_UpdateHlink(IHlinkBrowseContext* iface,
IHlink *link;
HRESULT hr;
TRACE("(%p)->(0x%x %p %s %s)\n", This, hlid, target, debugstr_w(location), debugstr_w(friendly_name));
TRACE("(%p)->(0x%lx %p %s %s)\n", This, hlid, target, debugstr_w(location), debugstr_w(friendly_name));
if (!entry)
return E_INVALIDARG;
......@@ -303,7 +303,7 @@ static HRESULT WINAPI IHlinkBC_GetHlink(IHlinkBrowseContext* iface, ULONG hlid,
HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface);
struct link_entry *link;
TRACE("(%p)->(0x%x %p)\n", This, hlid, ret);
TRACE("(%p)->(0x%lx %p)\n", This, hlid, ret);
link = context_get_entry(This, hlid);
if (!link)
......@@ -320,7 +320,7 @@ static HRESULT WINAPI IHlinkBC_SetCurrentHlink(IHlinkBrowseContext* iface, ULONG
HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface);
struct link_entry *link;
TRACE("(%p)->(0x%08x)\n", This, hlid);
TRACE("(%p)->(0x%08lx)\n", This, hlid);
link = context_get_entry(This, hlid);
if (!link)
......
dlls/hlink/extserv.c
View file @ 34a94ea3
......@@ -76,7 +76,7 @@ static ULONG WINAPI ExtServUnk_AddRef(IUnknown *iface)
ExtensionService *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;
}
......@@ -86,7 +86,7 @@ static ULONG WINAPI ExtServUnk_Release(IUnknown *iface)
ExtensionService *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) {
heap_free(This->username);
......@@ -179,7 +179,7 @@ static HRESULT WINAPI HttpNegotiate_BeginningTransaction(IHttpNegotiate *iface,
{
ExtensionService *This = impl_from_IHttpNegotiate(iface);
TRACE("(%p)->(%s %s %x %p)\n", This, debugstr_w(szURL), debugstr_w(szHeaders), dwReserved,
TRACE("(%p)->(%s %s %lx %p)\n", This, debugstr_w(szURL), debugstr_w(szHeaders), dwReserved,
pszAdditionalHeaders);
if(!pszAdditionalHeaders)
......@@ -194,7 +194,7 @@ static HRESULT WINAPI HttpNegotiate_OnResponse(IHttpNegotiate *iface, DWORD dwRe
{
ExtensionService *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);
*pszAdditionalRequestHeaders = NULL;
......
dlls/hlink/hlink_main.c
View file @ 34a94ea3
......@@ -51,7 +51,7 @@ HRESULT WINAPI HlinkCreateFromMoniker( IMoniker *pimkTrgt, LPCWSTR pwzLocation,
IHlink *hl = NULL;
HRESULT r;
TRACE("%p %s %s %p %i %p %s %p\n", pimkTrgt, debugstr_w(pwzLocation),
TRACE("%p %s %s %p %li %p %s %p\n", pimkTrgt, debugstr_w(pwzLocation),
debugstr_w(pwzFriendlyName), pihlsite, dwSiteData, piunkOuter,
debugstr_guid(riid), ppvObj);
......@@ -68,7 +68,7 @@ HRESULT WINAPI HlinkCreateFromMoniker( IMoniker *pimkTrgt, LPCWSTR pwzLocation,
*ppvObj = hl;
TRACE("Returning %i\n",r);
TRACE("Returning %lx\n",r);
return r;
}
......@@ -85,7 +85,7 @@ HRESULT WINAPI HlinkCreateFromString( LPCWSTR pwzTarget, LPCWSTR pwzLocation,
WCHAR *hash, *tgt;
const WCHAR *loc;
TRACE("%s %s %s %p %i %p %s %p\n", debugstr_w(pwzTarget),
TRACE("%s %s %s %p %li %p %s %p\n", debugstr_w(pwzTarget),
debugstr_w(pwzLocation), debugstr_w(pwzFriendlyName), pihlsite,
dwSiteData, piunkOuter, debugstr_guid(riid), ppvObj);
......@@ -138,7 +138,7 @@ HRESULT WINAPI HlinkCreateFromString( LPCWSTR pwzTarget, LPCWSTR pwzLocation,
if (pihlsite)
IHlink_SetHlinkSite(hl, pihlsite, dwSiteData);
TRACE("Returning %i\n",r);
TRACE("Returning %lx\n",r);
*ppvObj = hl;
return r;
......@@ -163,7 +163,7 @@ HRESULT WINAPI HlinkNavigate(IHlink *phl, IHlinkFrame *phlFrame,
{
HRESULT r = S_OK;
TRACE("%p %p %i %p %p %p\n", phl, phlFrame, grfHLNF, pbc, pbsc, phlbc);
TRACE("%p %p %li %p %p %p\n", phl, phlFrame, grfHLNF, pbc, pbsc, phlbc);
if (phlFrame)
r = IHlinkFrame_Navigate(phlFrame, grfHLNF, pbc, pbsc, phl);
......@@ -182,7 +182,7 @@ HRESULT WINAPI HlinkOnNavigate( IHlinkFrame *phlFrame,
{
HRESULT r;
TRACE("%p %p %i %p %s %s %p\n",phlFrame, phlbc, grfHLNF, pmkTarget,
TRACE("%p %p %li %p %s %s %p\n",phlFrame, phlbc, grfHLNF, pmkTarget,
debugstr_w(pwzLocation), debugstr_w(pwzFriendlyName), puHLID);
r = IHlinkBrowseContext_OnNavigateHlink(phlbc, grfHLNF, pmkTarget,
......@@ -202,7 +202,7 @@ HRESULT WINAPI HlinkCreateFromData(IDataObject *piDataObj,
IHlinkSite *pihlsite, DWORD dwSiteData, IUnknown *piunkOuter,
REFIID riid, void **ppvObj)
{
FIXME("%p, %p, %d, %p, %s, %p\n", piDataObj, pihlsite, dwSiteData,
FIXME("%p, %p, %ld, %p, %s, %p\n", piDataObj, pihlsite, dwSiteData,
piunkOuter, debugstr_guid(riid), ppvObj);
*ppvObj = NULL;
return E_NOTIMPL;
......@@ -228,7 +228,7 @@ HRESULT WINAPI HlinkNavigateToStringReference( LPCWSTR pwzTarget,
HRESULT r;
IHlink *hlink = NULL;
TRACE("%s %s %p %08x %p %08x %p %p %p\n",
TRACE("%s %s %p %08lx %p %08lx %p %p %p\n",
debugstr_w(pwzTarget), debugstr_w(pwzLocation), pihlsite,
dwSiteData, pihlframe, grfHLNF, pibc, pibsc, pihlbc);
......@@ -271,7 +271,7 @@ HRESULT WINAPI HlinkGetSpecialReference(ULONG uReference, LPWSTR *ppwzReference)
WCHAR *buf;
HKEY hkey;
TRACE("(%u %p)\n", uReference, ppwzReference);
TRACE("(%lu %p)\n", uReference, ppwzReference);
*ppwzReference = NULL;
......@@ -290,7 +290,7 @@ HRESULT WINAPI HlinkGetSpecialReference(ULONG uReference, LPWSTR *ppwzReference)
res = RegOpenKeyW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Internet Explorer\\Main", &hkey);
if(res != ERROR_SUCCESS) {
WARN("Could not open key: %u\n", res);
WARN("Could not open key: %lu\n", res);
return HRESULT_FROM_WIN32(res);
}
......@@ -301,7 +301,7 @@ HRESULT WINAPI HlinkGetSpecialReference(ULONG uReference, LPWSTR *ppwzReference)
res = RegQueryValueExW(hkey, value_name, NULL, &type, (PBYTE)buf, &size);
RegCloseKey(hkey);
if(res != ERROR_SUCCESS) {
WARN("Could not query value %s: %u\n", debugstr_w(value_name), res);
WARN("Could not query value %s: %lu\n", debugstr_w(value_name), res);
CoTaskMemFree(buf);
return HRESULT_FROM_WIN32(res);
}
......@@ -315,7 +315,7 @@ HRESULT WINAPI HlinkGetSpecialReference(ULONG uReference, LPWSTR *ppwzReference)
*/
HRESULT WINAPI HlinkTranslateURL(LPCWSTR pwzURL, DWORD grfFlags, LPWSTR *ppwzTranslatedURL)
{
FIXME("(%s %08x %p)\n", debugstr_w(pwzURL), grfFlags, ppwzTranslatedURL);
FIXME("(%s %08lx %p)\n", debugstr_w(pwzURL), grfFlags, ppwzTranslatedURL);
return E_NOTIMPL;
}
......@@ -327,7 +327,7 @@ HRESULT WINAPI HlinkUpdateStackItem(IHlinkFrame *frame, IHlinkBrowseContext *bc,
{
HRESULT hr;
TRACE("(%p %p 0x%x %p %s %s)\n", frame, bc, hlid, target, debugstr_w(location), debugstr_w(friendly_name));
TRACE("(%p %p 0x%lx %p %s %s)\n", frame, bc, hlid, target, debugstr_w(location), debugstr_w(friendly_name));
if (!frame && !bc) return E_INVALIDARG;
......@@ -391,7 +391,7 @@ HRESULT WINAPI HlinkResolveMonikerForData(LPMONIKER pimkReference, DWORD reserve
void *obj = NULL;
HRESULT hres;
TRACE("(%p %x %p %d %p %p %p)\n", pimkReference, reserved, pibc, cFmtetc, rgFmtetc, pibsc, pimkBase);
TRACE("(%p %lx %p %ld %p %p %p)\n", pimkReference, reserved, pibc, cFmtetc, rgFmtetc, pibsc, pimkBase);
if(cFmtetc || rgFmtetc || pimkBase)
FIXME("Unsupported args\n");
......@@ -402,7 +402,7 @@ HRESULT WINAPI HlinkResolveMonikerForData(LPMONIKER pimkReference, DWORD reserve
hres = IMoniker_IsSystemMoniker(pimkReference, &mksys);
if(SUCCEEDED(hres) && mksys != MKSYS_URLMONIKER)
WARN("sysmk = %x\n", mksys);
WARN("sysmk = %lx\n", mksys);
/* FIXME: What is it for? */
CreateBindCtx(0, &bctx);
......
dlls/hlink/link.c
View file @ 34a94ea3
......@@ -154,7 +154,7 @@ static ULONG WINAPI IHlink_fnAddRef (IHlink* iface)
HlinkImpl *This = impl_from_IHlink(iface);
ULONG refCount = InterlockedIncrement(&This->ref);
TRACE("(%p)->(count=%u)\n", This, refCount - 1);
TRACE("(%p)->(count=%lu)\n", This, refCount - 1);
return refCount;
}
......@@ -164,7 +164,7 @@ static ULONG WINAPI IHlink_fnRelease (IHlink* iface)
HlinkImpl *This = impl_from_IHlink(iface);
ULONG refCount = InterlockedDecrement(&This->ref);
TRACE("(%p)->(count=%u)\n", This, refCount + 1);
TRACE("(%p)->(count=%lu)\n", This, refCount + 1);
if (refCount)
return refCount;
......@@ -185,7 +185,7 @@ static HRESULT WINAPI IHlink_fnSetHlinkSite( IHlink* iface,
{
HlinkImpl *This = impl_from_IHlink(iface);
TRACE("(%p)->(%p %i)\n", This, pihlSite, dwSiteData);
TRACE("(%p)->(%p %li)\n", This, pihlSite, dwSiteData);
if (This->Site)
IHlinkSite_Release(This->Site);
......@@ -221,7 +221,7 @@ static HRESULT WINAPI IHlink_fnSetMonikerReference( IHlink* iface,
{
HlinkImpl *This = impl_from_IHlink(iface);
TRACE("(%p)->(%i %p %s)\n", This, rfHLSETF, pmkTarget,
TRACE("(%p)->(%li %p %s)\n", This, rfHLSETF, pmkTarget,
debugstr_w(pwzLocation));
if(rfHLSETF == 0)
......@@ -260,7 +260,7 @@ static HRESULT WINAPI IHlink_fnSetStringReference(IHlink* iface,
{
HlinkImpl *This = impl_from_IHlink(iface);
TRACE("(%p)->(%i %s %s)\n", This, grfHLSETF, debugstr_w(pwzTarget),
TRACE("(%p)->(%li %s %s)\n", This, grfHLSETF, debugstr_w(pwzTarget),
debugstr_w(pwzLocation));
if(grfHLSETF > (HLINKSETF_TARGET | HLINKSETF_LOCATION) &&
......@@ -297,7 +297,7 @@ static HRESULT WINAPI IHlink_fnSetStringReference(IHlink* iface,
r = CreateFileMoniker(pwzTarget, &pMon);
if (FAILED(r))
{
ERR("couldn't create moniker for %s, failed with error 0x%08x\n",
ERR("couldn't create moniker for %s, failed with error 0x%08lx\n",
debugstr_w(pwzTarget), r);
return r;
}
......@@ -324,7 +324,7 @@ static HRESULT WINAPI IHlink_fnGetMonikerReference(IHlink* iface,
{
HlinkImpl *This = impl_from_IHlink(iface);
TRACE("(%p) -> (%i %p %p)\n", This, dwWhichRef, ppimkTarget,
TRACE("(%p) -> (%li %p %p)\n", This, dwWhichRef, ppimkTarget,
ppwzLocation);
if (ppimkTarget)
......@@ -349,7 +349,7 @@ static HRESULT WINAPI IHlink_fnGetStringReference (IHlink* iface,
{
HlinkImpl *This = impl_from_IHlink(iface);
TRACE("(%p) -> (%i %p %p)\n", This, dwWhichRef, ppwzTarget, ppwzLocation);
TRACE("(%p) -> (%li %p %p)\n", This, dwWhichRef, ppwzTarget, ppwzLocation);
if(dwWhichRef != -1 && dwWhichRef & ~(HLINKGETREF_DEFAULT | HLINKGETREF_ABSOLUTE | HLINKGETREF_RELATIVE))
{
......@@ -410,7 +410,7 @@ static HRESULT WINAPI IHlink_fnGetFriendlyName (IHlink* iface,
{
HlinkImpl *This = impl_from_IHlink(iface);
TRACE("(%p) -> (%i %p)\n", This, grfHLFNAMEF, ppwzFriendlyName);
TRACE("(%p) -> (%li %p)\n", This, grfHLFNAMEF, ppwzFriendlyName);
/* FIXME: Only using explicitly set and cached friendly names */
......@@ -485,7 +485,7 @@ static HRESULT WINAPI IHlink_fnNavigate(IHlink *iface, DWORD flags, IBindCtx *us
IMoniker *mon = NULL;
HRESULT r;
TRACE("hlink %p, flags %#x, user_bind_ctx %p, bind_callback %p, browse_ctx %p.\n",
TRACE("hlink %p, flags %#lx, user_bind_ctx %p, bind_callback %p, browse_ctx %p.\n",
This, flags, user_bind_ctx, bind_callback, browse_ctx);
if (This->async_bind_ctx)
......@@ -765,7 +765,7 @@ static HRESULT read_hlink_string(IStream *pStm, LPWSTR *out_str)
if (FAILED(hr)) return hr;
if (read != sizeof(len)) return STG_E_READFAULT;
TRACE("read len %d\n", len);
TRACE("read len %ld\n", len);
str = heap_alloc(len * sizeof(WCHAR));
if (!str) return E_OUTOFMEMORY;
......@@ -802,7 +802,7 @@ static HRESULT WINAPI IPersistStream_fnLoad(IPersistStream* iface,
goto end;
}
if (hdr[1] & ~HLINK_SAVE_ALL)
FIXME("unknown flag(s) 0x%x\n", hdr[1] & ~HLINK_SAVE_ALL);
FIXME("unknown flag(s) 0x%lx\n", hdr[1] & ~HLINK_SAVE_ALL);
if (hdr[1] & HLINK_SAVE_TARGET_FRAME_PRESENT)
{
......@@ -837,7 +837,7 @@ static HRESULT WINAPI IPersistStream_fnLoad(IPersistStream* iface,
}
end:
TRACE("Load Result 0x%x (%p)\n", r, This->Moniker);
TRACE("Load Result 0x%lx (%p)\n", r, This->Moniker);
return r;
}
......@@ -908,7 +908,7 @@ static HRESULT WINAPI IPersistStream_fnSave(IPersistStream* iface,
end:
if (moniker) IMoniker_Release(moniker);
TRACE("Save Result 0x%x\n", r);
TRACE("Save Result 0x%lx\n", r);
return r;
}
......@@ -1002,7 +1002,7 @@ static HRESULT WINAPI bind_callback_OnStartBinding(IBindStatusCallback *iface,
{
HlinkImpl *hlink = impl_from_IBindStatusCallback(iface);
TRACE("hlink %p, reserved %#x, binding %p.\n", hlink, reserved, binding);
TRACE("hlink %p, reserved %#lx, binding %p.\n", hlink, reserved, binding);
if (hlink->bind_callback)
return IBindStatusCallback_OnStartBinding(hlink->bind_callback, reserved, binding);
......@@ -1019,7 +1019,7 @@ static HRESULT WINAPI bind_callback_OnLowResource(IBindStatusCallback *iface, DW
{
HlinkImpl *hlink = impl_from_IBindStatusCallback(iface);
TRACE("hlink %p, reserved %#x.\n", hlink, reserved);
TRACE("hlink %p, reserved %#lx.\n", hlink, reserved);
if (hlink->bind_callback)
return IBindStatusCallback_OnLowResource(hlink->bind_callback, reserved);
......@@ -1031,7 +1031,7 @@ static HRESULT WINAPI bind_callback_OnProgress(IBindStatusCallback *iface,
{
HlinkImpl *hlink = impl_from_IBindStatusCallback(iface);
TRACE("hlink %p, progress %u, max %u, status %u, text %s.\n",
TRACE("hlink %p, progress %lu, max %lu, status %lu, text %s.\n",
hlink, progress, max, status, debugstr_w(text));
if (hlink->bind_callback)
......@@ -1044,7 +1044,7 @@ static HRESULT WINAPI bind_callback_OnStopBinding(IBindStatusCallback *iface,
{
HlinkImpl *hlink = impl_from_IBindStatusCallback(iface);
TRACE("hlink %p, hr %#x, error %s.\n", hlink, hr, debugstr_w(error));
TRACE("hlink %p, hr %#lx, error %s.\n", hlink, hr, debugstr_w(error));
if (hlink->bind_callback)
IBindStatusCallback_OnStopBinding(hlink->bind_callback, hr, error);
......@@ -1076,7 +1076,7 @@ static HRESULT WINAPI bind_callback_GetBindInfo(IBindStatusCallback *iface,
static HRESULT WINAPI bind_callback_OnDataAvailable(IBindStatusCallback *iface,
DWORD flags, DWORD size, FORMATETC *formatetc, STGMEDIUM *stgmed)
{
FIXME("iface %p, flags %#x, size %d, formatetc %p, stgmed %p, stub!\n",
FIXME("iface %p, flags %#lx, size %ld, formatetc %p, stgmed %p, stub!\n",
iface, flags, size, formatetc, stgmed);
return E_NOTIMPL;
}
......
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