ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

urlmon: Enable compilation with long types. 

Signed-off-by: Eric Pouech <eric.pouech@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Eric Pouech 2022-02-18 09:18:16 +01:00 committed by Alexandre Julliard
parent 156afe3044
commit 5d09d6d437
22 changed files with 470 additions and 470 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/urlmon/Makefile.in
View File

@ -1,7 +1,7 @@
MODULE = urlmon.dll
IMPORTLIB = urlmon
IMPORTS = uuid ole32 oleaut32 shell32 rpcrt4 shlwapi wininet user32 advapi32
EXTRADEFS = -DWINE_NO_LONG_TYPES -D_URLMON_
EXTRADEFS = -D_URLMON_
DELAYIMPORTS = advpack
C_SRCS = \

10
dlls/urlmon/axinstall.c
View File

@ -74,7 +74,7 @@ static HRESULT extract_cab_file(install_ctx_t *ctx)
hres = ExtractFilesW(ctx->cache_file, ctx->tmp_dir, 0, NULL, NULL, 0);
if(FAILED(hres)) {
WARN("ExtractFilesW failed: %08x\n", hres);
WARN("ExtractFilesW failed: %08lx\n", hres);
return hres;
}
@ -255,7 +255,7 @@ static HRESULT install_inf_file(install_ctx_t *ctx)
hres = RunSetupCommandW(ctx->hwnd, ctx->install_file, sect_name,
ctx->tmp_dir, NULL, NULL, RSC_FLAG_INF, NULL);
if(FAILED(hres)) {
WARN("RunSetupCommandW failed: %08x\n", hres);
WARN("RunSetupCommandW failed: %08lx\n", hres);
return hres;
}
}
@ -264,7 +264,7 @@ static HRESULT install_inf_file(install_ctx_t *ctx)
if(default_install) {
hres = RunSetupCommandW(ctx->hwnd, ctx->install_file, NULL, ctx->tmp_dir, NULL, NULL, RSC_FLAG_INF, NULL);
if(FAILED(hres)) {
WARN("RunSetupCommandW failed: %08x\n", hres);
WARN("RunSetupCommandW failed: %08lx\n", hres);
return hres;
}
}
@ -474,7 +474,7 @@ static HRESULT distunit_on_stop(void *ctx, const WCHAR *cache_file, HRESULT hres
{
install_ctx_t *install_ctx = ctx;
TRACE("(%p %s %08x %s)\n", ctx, debugstr_w(cache_file), hresult, debugstr_w(error_str));
TRACE("(%p %s %08lx %s)\n", ctx, debugstr_w(cache_file), hresult, debugstr_w(error_str));
if(hresult == S_OK) {
hresult = install_file(install_ctx, cache_file);
@ -499,7 +499,7 @@ HRESULT WINAPI AsyncInstallDistributionUnit(const WCHAR *szDistUnit, const WCHAR
install_ctx_t *ctx;
HRESULT hres;
TRACE("(%s %s %s %x %x %s %p %p %x)\n", debugstr_w(szDistUnit), debugstr_w(szTYPE), debugstr_w(szExt),
TRACE("(%s %s %s %lx %lx %s %p %p %lx)\n", debugstr_w(szDistUnit), debugstr_w(szTYPE), debugstr_w(szExt),
dwFileVersionMS, dwFileVersionLS, debugstr_w(szURL), pbc, pvReserved, flags);
if(szDistUnit || szTYPE || szExt)

36
dlls/urlmon/bindctx.c
View File

@ -146,7 +146,7 @@ static ULONG WINAPI BindStatusCallback_AddRef(IBindStatusCallbackEx *iface)
BindStatusCallback *This = impl_from_IBindStatusCallbackEx(iface);
LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref = %d\n", This, ref);
TRACE("(%p) ref = %ld\n", This, ref);
return ref;
}
@ -156,7 +156,7 @@ static ULONG WINAPI BindStatusCallback_Release(IBindStatusCallbackEx *iface)
BindStatusCallback *This = impl_from_IBindStatusCallbackEx(iface);
LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref = %d\n", This, ref);
TRACE("(%p) ref = %ld\n", This, ref);
if(!ref) {
if(This->serv_prov)
@ -173,7 +173,7 @@ static HRESULT WINAPI BindStatusCallback_OnStartBinding(IBindStatusCallbackEx *i
{
BindStatusCallback *This = impl_from_IBindStatusCallbackEx(iface);
TRACE("(%p)->(%d %p)\n", This, dwReserved, pbind);
TRACE("(%p)->(%ld %p)\n", This, dwReserved, pbind);
return IBindStatusCallback_OnStartBinding(This->callback, 0xff, pbind);
}
@ -191,7 +191,7 @@ static HRESULT WINAPI BindStatusCallback_OnLowResource(IBindStatusCallbackEx *if
{
BindStatusCallback *This = impl_from_IBindStatusCallbackEx(iface);
TRACE("(%p)->(%d)\n", This, reserved);
TRACE("(%p)->(%ld)\n", This, reserved);
return IBindStatusCallback_OnLowResource(This->callback, reserved);
}
@ -201,7 +201,7 @@ static HRESULT WINAPI BindStatusCallback_OnProgress(IBindStatusCallbackEx *iface
{
BindStatusCallback *This = impl_from_IBindStatusCallbackEx(iface);
TRACE("%p)->(%u %u %s %s)\n", This, ulProgress, ulProgressMax, debugstr_bindstatus(ulStatusCode),
TRACE("%p)->(%lu %lu %s %s)\n", This, ulProgress, ulProgressMax, debugstr_bindstatus(ulStatusCode),
debugstr_w(szStatusText));
return IBindStatusCallback_OnProgress(This->callback, ulProgress,
@ -213,7 +213,7 @@ static HRESULT WINAPI BindStatusCallback_OnStopBinding(IBindStatusCallbackEx *if
{
BindStatusCallback *This = impl_from_IBindStatusCallbackEx(iface);
TRACE("(%p)->(%08x %s)\n", This, hresult, debugstr_w(szError));
TRACE("(%p)->(%08lx %s)\n", This, hresult, debugstr_w(szError));
return IBindStatusCallback_OnStopBinding(This->callback, hresult, szError);
}
@ -245,7 +245,7 @@ static HRESULT WINAPI BindStatusCallback_OnDataAvailable(IBindStatusCallbackEx *
{
BindStatusCallback *This = impl_from_IBindStatusCallbackEx(iface);
TRACE("(%p)->(%08x %d %p %p)\n", This, grfBSCF, dwSize, pformatetc, pstgmed);
TRACE("(%p)->(%08lx %ld %p %p)\n", This, grfBSCF, dwSize, pformatetc, pstgmed);
return IBindStatusCallback_OnDataAvailable(This->callback, grfBSCF, dwSize, pformatetc, pstgmed);
}
@ -393,7 +393,7 @@ static HRESULT WINAPI BSCHttpNegotiate_BeginningTransaction(IHttpNegotiate2 *ifa
IHttpNegotiate *http_negotiate;
HRESULT hres = S_OK;
TRACE("(%p)->(%s %s %d %p)\n", This, debugstr_w(szURL), debugstr_w(szHeaders), dwReserved,
TRACE("(%p)->(%s %s %ld %p)\n", This, debugstr_w(szURL), debugstr_w(szHeaders), dwReserved,
pszAdditionalHeaders);
*pszAdditionalHeaders = NULL;
@ -417,7 +417,7 @@ static HRESULT WINAPI BSCHttpNegotiate_OnResponse(IHttpNegotiate2 *iface, DWORD
IHttpNegotiate *http_negotiate;
HRESULT hres = S_OK;
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);
http_negotiate = get_callback_iface(This, &IID_IHttpNegotiate);
@ -442,7 +442,7 @@ static HRESULT WINAPI BSCHttpNegotiate_GetRootSecurityId(IHttpNegotiate2 *iface,
IHttpNegotiate2 *http_negotiate2;
HRESULT hres = E_FAIL;
TRACE("(%p)->(%p %p %ld)\n", This, pbSecurityId, pcbSecurityId, dwReserved);
TRACE("(%p)->(%p %p %Id)\n", This, pbSecurityId, pcbSecurityId, dwReserved);
http_negotiate2 = get_callback_iface(This, &IID_IHttpNegotiate2);
if(http_negotiate2) {
@ -538,7 +538,7 @@ static HRESULT WINAPI BSCInternetBindInfo_GetBindString(IInternetBindInfo *iface
IInternetBindInfo *bind_info;
HRESULT hres;
TRACE("(%p)->(%d %p %d %p)\n", This, string_type, strs, cnt, fetched);
TRACE("(%p)->(%ld %p %ld %p)\n", This, string_type, strs, cnt, fetched);
hres = IBindStatusCallback_QueryInterface(This->callback, &IID_IInternetBindInfo, (void**)&bind_info);
if(FAILED(hres))
@ -619,7 +619,7 @@ HRESULT WINAPI RegisterBindStatusCallback(IBindCtx *pbc, IBindStatusCallback *pb
IBindStatusCallback *bsc, *prev = NULL;
HRESULT hres;
TRACE("(%p %p %p %x)\n", pbc, pbsc, ppbscPrevious, dwReserved);
TRACE("(%p %p %p %lx)\n", pbc, pbsc, ppbscPrevious, dwReserved);
if (!pbc || !pbsc)
return E_INVALIDARG;
@ -737,7 +737,7 @@ static ULONG WINAPI AsyncBindCtx_AddRef(IBindCtx *iface)
AsyncBindCtx *This = impl_from_IBindCtx(iface);
LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref);
TRACE("(%p) ref=%ld\n", This, ref);
return ref;
}
@ -747,7 +747,7 @@ static ULONG WINAPI AsyncBindCtx_Release(IBindCtx *iface)
AsyncBindCtx *This = impl_from_IBindCtx(iface);
LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref);
TRACE("(%p) ref=%ld\n", This, ref);
if(!ref) {
IBindCtx_Release(This->bindctx);
@ -871,7 +871,7 @@ static HRESULT init_bindctx(IBindCtx *bindctx, DWORD options,
HRESULT hres;
if(options)
FIXME("not supported options %08x\n", options);
FIXME("not supported options %08lx\n", options);
if(format)
FIXME("format is not supported\n");
@ -902,7 +902,7 @@ HRESULT WINAPI CreateAsyncBindCtx(DWORD reserved, IBindStatusCallback *callback,
IBindCtx *bindctx;
HRESULT hres;
TRACE("(%08x %p %p %p)\n", reserved, callback, format, pbind);
TRACE("(%08lx %p %p %p)\n", reserved, callback, format, pbind);
if(!pbind || !callback)
return E_INVALIDARG;
@ -934,13 +934,13 @@ HRESULT WINAPI CreateAsyncBindCtxEx(IBindCtx *ibind, DWORD options,
IBindCtx *bindctx;
HRESULT hres;
TRACE("(%p %08x %p %p %p %d)\n", ibind, options, callback, format, pbind, reserved);
TRACE("(%p %08lx %p %p %p %ld)\n", ibind, options, callback, format, pbind, reserved);
if(!pbind)
return E_INVALIDARG;
if(reserved)
WARN("reserved=%d\n", reserved);
WARN("reserved=%ld\n", reserved);
if(ibind) {
IBindCtx_AddRef(ibind);

90
dlls/urlmon/binding.c
View File

@ -131,15 +131,15 @@ static void dump_BINDINFO(BINDINFO *bi)
TRACE("\n"
"BINDINFO = {\n"
" %d, %s,\n"
" {%d, %p, %p},\n"
" %ld, %s,\n"
" {%ld, %p, %p},\n"
" %s,\n"
" %s,\n"
" %s,\n"
" %d, %08x, %d, %d\n"
" {%d %p %x},\n"
" %ld, %08lx, %ld, %ld\n"
" {%ld %p %x},\n"
" %s\n"
" %p, %d\n"
" %p, %ld\n"
"}\n",
bi->cbSize, debugstr_w(bi->szExtraInfo),
@ -206,7 +206,7 @@ static LPWSTR get_mime_clsid(LPCWSTR mime, CLSID *clsid)
res = RegOpenKeyW(HKEY_CLASSES_ROOT, key_name, &hkey);
heap_free(key_name);
if(res != ERROR_SUCCESS) {
WARN("Could not open MIME key: %x\n", res);
WARN("Could not open MIME key: %lx\n", res);
return NULL;
}
@ -215,14 +215,14 @@ static LPWSTR get_mime_clsid(LPCWSTR mime, CLSID *clsid)
res = RegQueryValueExW(hkey, L"CLSID", NULL, &type, (BYTE*)ret, &size);
RegCloseKey(hkey);
if(res != ERROR_SUCCESS) {
WARN("Could not get CLSID: %08x\n", res);
WARN("Could not get CLSID: %08lx\n", res);
heap_free(ret);
return NULL;
}
hres = CLSIDFromString(ret, clsid);
if(FAILED(hres)) {
WARN("Could not parse CLSID: %08x\n", hres);
WARN("Could not parse CLSID: %08lx\n", hres);
heap_free(ret);
return NULL;
}
@ -237,7 +237,7 @@ static void load_doc_mon(Binding *binding, IPersistMoniker *persist)
hres = CreateAsyncBindCtxEx(binding->bctx, 0, NULL, NULL, &bctx, 0);
if(FAILED(hres)) {
WARN("CreateAsyncBindCtxEx failed: %08x\n", hres);
WARN("CreateAsyncBindCtxEx failed: %08lx\n", hres);
return;
}
@ -248,7 +248,7 @@ static void load_doc_mon(Binding *binding, IPersistMoniker *persist)
IBindCtx_RevokeObjectParam(bctx, cbinding_contextW);
IBindCtx_Release(bctx);
if(FAILED(hres))
FIXME("Load failed: %08x\n", hres);
FIXME("Load failed: %08lx\n", hres);
}
static HRESULT create_mime_object(Binding *binding, const CLSID *clsid, LPCWSTR clsid_str)
@ -259,7 +259,7 @@ static HRESULT create_mime_object(Binding *binding, const CLSID *clsid, LPCWSTR
hres = CoCreateInstance(clsid, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER,
&binding->iid, (void**)&binding->obj);
if(FAILED(hres)) {
WARN("CoCreateInstance failed: %08x\n", hres);
WARN("CoCreateInstance failed: %08lx\n", hres);
return INET_E_CANNOT_INSTANTIATE_OBJECT;
}
@ -280,7 +280,7 @@ static HRESULT create_mime_object(Binding *binding, const CLSID *clsid, LPCWSTR
IPersistMoniker_Release(persist);
}else {
FIXME("Could not get IPersistMoniker: %08x\n", hres);
FIXME("Could not get IPersistMoniker: %08lx\n", hres);
/* FIXME: Try query IPersistFile */
}
@ -330,7 +330,7 @@ static void cache_file_available(Binding *This, const WCHAR *file_name)
This->stgmed_buf->file = CreateFileW(file_name, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL,
OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
if(This->stgmed_buf->file == INVALID_HANDLE_VALUE)
WARN("CreateFile failed: %u\n", GetLastError());
WARN("CreateFile failed: %lu\n", GetLastError());
}
}
@ -362,7 +362,7 @@ static ULONG WINAPI StgMedUnk_AddRef(IUnknown *iface)
stgmed_buf_t *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;
}
@ -372,7 +372,7 @@ static ULONG WINAPI StgMedUnk_Release(IUnknown *iface)
stgmed_buf_t *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->file != INVALID_HANDLE_VALUE)
@ -457,7 +457,7 @@ static ULONG WINAPI ProtocolStream_AddRef(IStream *iface)
ProtocolStream *This = impl_from_IStream(iface);
LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref);
TRACE("(%p) ref=%ld\n", This, ref);
return ref;
}
@ -467,7 +467,7 @@ static ULONG WINAPI ProtocolStream_Release(IStream *iface)
ProtocolStream *This = impl_from_IStream(iface);
LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref);
TRACE("(%p) ref=%ld\n", This, ref);
if(!ref) {
IUnknown_Release(&This->buf->IUnknown_iface);
@ -486,7 +486,7 @@ static HRESULT WINAPI ProtocolStream_Read(IStream *iface, void *pv,
DWORD read = 0;
HRESULT hres;
TRACE("(%p)->(%p %d %p)\n", This, pv, cb, pcbRead);
TRACE("(%p)->(%p %ld %p)\n", This, pv, cb, pcbRead);
if(This->buf->file == INVALID_HANDLE_VALUE) {
hres = This->buf->hres = IInternetProtocolEx_Read(This->buf->protocol, (PBYTE)pv, cb, &read);
@ -500,7 +500,7 @@ static HRESULT WINAPI ProtocolStream_Read(IStream *iface, void *pv,
if(hres == E_PENDING)
return E_PENDING;
else if(FAILED(hres))
FIXME("Read failed: %08x\n", hres);
FIXME("Read failed: %08lx\n", hres);
return read ? S_OK : S_FALSE;
}
@ -510,7 +510,7 @@ static HRESULT WINAPI ProtocolStream_Write(IStream *iface, const void *pv,
{
ProtocolStream *This = impl_from_IStream(iface);
TRACE("(%p)->(%p %d %p)\n", This, pv, cb, pcbWritten);
TRACE("(%p)->(%p %ld %p)\n", This, pv, cb, pcbWritten);
return STG_E_ACCESSDENIED;
}
@ -522,7 +522,7 @@ static HRESULT WINAPI ProtocolStream_Seek(IStream *iface, LARGE_INTEGER dlibMove
LARGE_INTEGER new_pos;
DWORD method;
TRACE("(%p)->(%d %08x %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition);
TRACE("(%p)->(%ld %08lx %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition);
if(This->buf->file == INVALID_HANDLE_VALUE) {
/* We should probably call protocol handler's Seek. */
@ -541,12 +541,12 @@ static HRESULT WINAPI ProtocolStream_Seek(IStream *iface, LARGE_INTEGER dlibMove
method = FILE_END;
break;
default:
WARN("Invalid origin %x\n", dwOrigin);
WARN("Invalid origin %lx\n", dwOrigin);
return E_FAIL;
}
if(!SetFilePointerEx(This->buf->file, dlibMove, &new_pos, method)) {
FIXME("SetFilePointerEx failed: %u\n", GetLastError());
FIXME("SetFilePointerEx failed: %lu\n", GetLastError());
return E_FAIL;
}
@ -558,7 +558,7 @@ static HRESULT WINAPI ProtocolStream_Seek(IStream *iface, LARGE_INTEGER dlibMove
static HRESULT WINAPI ProtocolStream_SetSize(IStream *iface, ULARGE_INTEGER libNewSize)
{
ProtocolStream *This = impl_from_IStream(iface);
FIXME("(%p)->(%d)\n", This, libNewSize.u.LowPart);
FIXME("(%p)->(%ld)\n", This, libNewSize.u.LowPart);
return E_NOTIMPL;
}
@ -566,7 +566,7 @@ static HRESULT WINAPI ProtocolStream_CopyTo(IStream *iface, IStream *pstm,
ULARGE_INTEGER cb, ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *pcbWritten)
{
ProtocolStream *This = impl_from_IStream(iface);
FIXME("(%p)->(%p %d %p %p)\n", This, pstm, cb.u.LowPart, pcbRead, pcbWritten);
FIXME("(%p)->(%p %ld %p %p)\n", This, pstm, cb.u.LowPart, pcbRead, pcbWritten);
return E_NOTIMPL;
}
@ -574,7 +574,7 @@ static HRESULT WINAPI ProtocolStream_Commit(IStream *iface, DWORD grfCommitFlags
{
ProtocolStream *This = impl_from_IStream(iface);
TRACE("(%p)->(%08x)\n", This, grfCommitFlags);
TRACE("(%p)->(%08lx)\n", This, grfCommitFlags);
return E_NOTIMPL;
}
@ -592,7 +592,7 @@ static HRESULT WINAPI ProtocolStream_LockRegion(IStream *iface, ULARGE_INTEGER l
ULARGE_INTEGER cb, DWORD dwLockType)
{
ProtocolStream *This = impl_from_IStream(iface);
FIXME("(%p)->(%d %d %d)\n", This, libOffset.u.LowPart, cb.u.LowPart, dwLockType);
FIXME("(%p)->(%ld %ld %ld)\n", This, libOffset.u.LowPart, cb.u.LowPart, dwLockType);
return E_NOTIMPL;
}
@ -600,7 +600,7 @@ static HRESULT WINAPI ProtocolStream_UnlockRegion(IStream *iface,
ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType)
{
ProtocolStream *This = impl_from_IStream(iface);
FIXME("(%p)->(%d %d %d)\n", This, libOffset.u.LowPart, cb.u.LowPart, dwLockType);
FIXME("(%p)->(%ld %ld %ld)\n", This, libOffset.u.LowPart, cb.u.LowPart, dwLockType);
return E_NOTIMPL;
}
@ -608,7 +608,7 @@ static HRESULT WINAPI ProtocolStream_Stat(IStream *iface, STATSTG *pstatstg,
DWORD dwStatFlag)
{
ProtocolStream *This = impl_from_IStream(iface);
TRACE("(%p)->(%p %08x)\n", This, pstatstg, dwStatFlag);
TRACE("(%p)->(%p %08lx)\n", This, pstatstg, dwStatFlag);
if(!pstatstg)
return E_FAIL;
@ -832,7 +832,7 @@ static ULONG WINAPI Binding_AddRef(IBinding *iface)
Binding *This = impl_from_IBinding(iface);
LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref);
TRACE("(%p) ref=%ld\n", This, ref);
return ref;
}
@ -842,7 +842,7 @@ static ULONG WINAPI Binding_Release(IBinding *iface)
Binding *This = impl_from_IBinding(iface);
LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref);
TRACE("(%p) ref=%ld\n", This, ref);
if(!ref) {
if(This->notif_hwnd)
@ -914,7 +914,7 @@ static HRESULT WINAPI Binding_Resume(IBinding *iface)
static HRESULT WINAPI Binding_SetPriority(IBinding *iface, LONG nPriority)
{
Binding *This = impl_from_IBinding(iface);
FIXME("(%p)->(%d)\n", This, nPriority);
FIXME("(%p)->(%ld)\n", This, nPriority);
return E_NOTIMPL;
}
@ -1067,7 +1067,7 @@ static HRESULT WINAPI InternetProtocolSink_ReportProgress(IInternetProtocolSink
case BINDSTATUS_ACCEPTRANGES:
break;
default:
FIXME("Unhandled status code %d\n", ulStatusCode);
FIXME("Unhandled status code %ld\n", ulStatusCode);
return E_NOTIMPL;
};
@ -1079,7 +1079,7 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres
FORMATETC formatetc = {0, NULL, 1, -1, TYMED_ISTREAM};
BOOL sent_begindownloaddata = FALSE;
TRACE("(%p)->(%d %u %u)\n", This, bscf, progress, progress_max);
TRACE("(%p)->(%ld %lu %lu)\n", This, bscf, progress, progress_max);
if(This->download_state == END_DOWNLOAD || (This->state & BINDING_ABORTED)) {
read_protocol_data(This->stgmed_buf);
@ -1149,7 +1149,7 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres
BINDSTATUS_ENDDOWNLOADDATA, This->url);
}
WARN("OnDataAvailable returned %x\n", hres);
WARN("OnDataAvailable returned %lx\n", hres);
stop_binding(This, hres, NULL);
return;
}
@ -1164,7 +1164,7 @@ static HRESULT WINAPI InternetProtocolSink_ReportData(IInternetProtocolSink *ifa
{
Binding *This = impl_from_IInternetProtocolSink(iface);
TRACE("(%p)->(%d %u %u)\n", This, grfBSCF, ulProgress, ulProgressMax);
TRACE("(%p)->(%ld %lu %lu)\n", This, grfBSCF, ulProgress, ulProgressMax);
report_data(This, grfBSCF, ulProgress, ulProgressMax);
return S_OK;
@ -1175,7 +1175,7 @@ static HRESULT WINAPI InternetProtocolSink_ReportResult(IInternetProtocolSink *i
{
Binding *This = impl_from_IInternetProtocolSink(iface);
TRACE("(%p)->(%08x %d %s)\n", This, hrResult, dwError, debugstr_w(szResult));
TRACE("(%p)->(%08lx %ld %s)\n", This, hrResult, dwError, debugstr_w(szResult));
stop_binding(This, hrResult, szResult);
@ -1233,7 +1233,7 @@ static HRESULT WINAPI InternetBindInfo_GetBindString(IInternetBindInfo *iface,
{
Binding *This = impl_from_IInternetBindInfo(iface);
TRACE("(%p)->(%d %p %d %p)\n", This, ulStringType, ppwzStr, cEl, pcElFetched);
TRACE("(%p)->(%ld %p %ld %p)\n", This, ulStringType, ppwzStr, cEl, pcElFetched);
switch(ulStringType) {
case BINDSTRING_ACCEPT_MIMES: {
@ -1273,7 +1273,7 @@ static HRESULT WINAPI InternetBindInfo_GetBindString(IInternetBindInfo *iface,
}
}
FIXME("not supported string type %d\n", ulStringType);
FIXME("not supported string type %ld\n", ulStringType);
return E_NOTIMPL;
}
@ -1315,7 +1315,7 @@ static HRESULT WINAPI WinInetHttpInfo_QueryOption(IWinInetHttpInfo *iface, DWORD
IWinInetInfo *wininet_info;
HRESULT hres;
TRACE("(%p)->(%x %p %p)\n", This, dwOption, pBuffer, pcbBuffer);
TRACE("(%p)->(%lx %p %p)\n", This, dwOption, pBuffer, pcbBuffer);
hres = IInternetProtocolEx_QueryInterface(&This->protocol->IInternetProtocolEx_iface,
&IID_IWinInetInfo, (void**)&wininet_info);
@ -1334,7 +1334,7 @@ static HRESULT WINAPI WinInetHttpInfo_QueryInfo(IWinInetHttpInfo *iface, DWORD d
IWinInetHttpInfo *http_info;
HRESULT hres;
TRACE("(%p)->(%x %p %p %p %p)\n", This, dwOption, pBuffer, pcbBuffer, pdwFlags, pdwReserved);
TRACE("(%p)->(%lx %p %p %p %p)\n", This, dwOption, pBuffer, pcbBuffer, pdwFlags, pdwReserved);
hres = IInternetProtocolEx_QueryInterface(&This->protocol->IInternetProtocolEx_iface,
&IID_IWinInetHttpInfo, (void**)&http_info);
@ -1503,12 +1503,12 @@ static HRESULT Binding_Create(IMoniker *mon, Binding *binding_ctx, IUri *uri, IB
hres = IBindStatusCallback_GetBindInfo(ret->callback, &ret->bindf, &ret->bindinfo);
if(FAILED(hres)) {
WARN("GetBindInfo failed: %08x\n", hres);
WARN("GetBindInfo failed: %08lx\n", hres);
IBinding_Release(&ret->IBinding_iface);
return hres;
}
TRACE("bindf %08x\n", ret->bindf);
TRACE("bindf %08lx\n", ret->bindf);
dump_BINDINFO(&ret->bindinfo);
ret->bindf |= BINDF_FROMURLMON;
@ -1566,7 +1566,7 @@ static HRESULT start_binding(IMoniker *mon, Binding *binding_ctx, IUri *uri, IBi
hres = IBindStatusCallback_OnStartBinding(binding->callback, 0, &binding->IBinding_iface);
if(FAILED(hres)) {
WARN("OnStartBinding failed: %08x\n", hres);
WARN("OnStartBinding failed: %08lx\n", hres);
if(hres != E_ABORT && hres != E_NOTIMPL)
hres = INET_E_DOWNLOAD_FAILURE;
@ -1587,7 +1587,7 @@ static HRESULT start_binding(IMoniker *mon, Binding *binding_ctx, IUri *uri, IBi
&binding->IInternetProtocolSink_iface, &binding->IInternetBindInfo_iface,
PI_APARTMENTTHREADED|PI_MIMEVERIFICATION, 0);
TRACE("start ret %08x\n", hres);
TRACE("start ret %08lx\n", hres);
if(FAILED(hres) && hres != E_PENDING) {
stop_binding(binding, hres, NULL);

52
dlls/urlmon/bindprot.c
View File

@ -234,7 +234,7 @@ static void mime_available(BindProtocol *This, LPCWSTR mime, BOOL verified)
hres = handle_mime_filter(This, mime_filter);
IInternetProtocol_Release(mime_filter);
if(FAILED(hres))
FIXME("MIME filter failed: %08x\n", hres);
FIXME("MIME filter failed: %08lx\n", hres);
}
if(This->reported_mime || verified || !(This->pi & PI_MIMEVERIFICATION)) {
@ -282,7 +282,7 @@ static HRESULT WINAPI BindProtocol_QueryInterface(IInternetProtocolEx *iface, RE
}else if(This->protocol_unk) {
HRESULT hres;
hres = IUnknown_QueryInterface(This->protocol_unk, riid, ppv);
TRACE("(%p) aggregated handler returned %08x for %s\n", This, hres, debugstr_guid(riid));
TRACE("(%p) aggregated handler returned %08lx for %s\n", This, hres, debugstr_guid(riid));
return hres;
}else {
WARN("not supported interface %s\n", debugstr_guid(riid));
@ -299,7 +299,7 @@ static ULONG WINAPI BindProtocol_AddRef(IInternetProtocolEx *iface)
{
BindProtocol *This = impl_from_IInternetProtocolEx(iface);
LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref);
TRACE("(%p) ref=%ld\n", This, ref);
return ref;
}
@ -329,7 +329,7 @@ static ULONG WINAPI BindProtocol_Release(IInternetProtocolEx *iface)
BindProtocol *This = impl_from_IInternetProtocolEx(iface);
LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref);
TRACE("(%p) ref=%ld\n", This, ref);
if(!ref) {
release_protocol_handler(This);
@ -365,7 +365,7 @@ static HRESULT WINAPI BindProtocol_Start(IInternetProtocolEx *iface, LPCWSTR szU
IUri *uri;
HRESULT hres;
TRACE("(%p)->(%s %p %p %08x %lx)\n", This, debugstr_w(szUrl), pOIProtSink,
TRACE("(%p)->(%s %p %p %08lx %Ix)\n", This, debugstr_w(szUrl), pOIProtSink,
pOIBindInfo, grfPI, dwReserved);
hres = CreateUri(szUrl, Uri_CREATE_FILE_USE_DOS_PATH, 0, &uri);
@ -393,7 +393,7 @@ static HRESULT WINAPI BindProtocol_Abort(IInternetProtocolEx *iface, HRESULT hrR
{
BindProtocol *This = impl_from_IInternetProtocolEx(iface);
TRACE("(%p)->(%08x %08x)\n", This, hrReason, dwOptions);
TRACE("(%p)->(%08lx %08lx)\n", This, hrReason, dwOptions);
return IInternetProtocol_Abort(This->protocol_handler, hrReason, dwOptions);
}
@ -402,7 +402,7 @@ static HRESULT WINAPI BindProtocol_Terminate(IInternetProtocolEx *iface, DWORD d
{
BindProtocol *This = impl_from_IInternetProtocolEx(iface);
TRACE("(%p)->(%08x)\n", This, dwOptions);
TRACE("(%p)->(%08lx)\n", This, dwOptions);
return IInternetProtocol_Terminate(This->protocol_handler, dwOptions);
}
@ -426,7 +426,7 @@ static HRESULT WINAPI BindProtocol_Read(IInternetProtocolEx *iface, void *pv,
{
BindProtocol *This = impl_from_IInternetProtocolEx(iface);
TRACE("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead);
TRACE("(%p)->(%p %lu %p)\n", This, pv, cb, pcbRead);
if(pcbRead)
*pcbRead = 0;
@ -437,7 +437,7 @@ static HRESULT WINAPI BindProtocol_Seek(IInternetProtocolEx *iface, LARGE_INTEGE
DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition)
{
BindProtocol *This = impl_from_IInternetProtocolEx(iface);
FIXME("(%p)->(%d %d %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition);
FIXME("(%p)->(%ld %ld %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition);
return E_NOTIMPL;
}
@ -445,7 +445,7 @@ static HRESULT WINAPI BindProtocol_LockRequest(IInternetProtocolEx *iface, DWORD
{
BindProtocol *This = impl_from_IInternetProtocolEx(iface);
TRACE("(%p)->(%08x)\n", This, dwOptions);
TRACE("(%p)->(%08lx)\n", This, dwOptions);
return IInternetProtocol_LockRequest(This->protocol_handler, dwOptions);
}
@ -473,7 +473,7 @@ static HRESULT WINAPI BindProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUr
LPOLESTR clsid_str;
HRESULT hres;
TRACE("(%p)->(%p %p %p %08x %p)\n", This, pUri, pOIProtSink, pOIBindInfo, grfPI, dwReserved);
TRACE("(%p)->(%p %p %p %08lx %p)\n", This, pUri, pOIProtSink, pOIBindInfo, grfPI, dwReserved);
if(!pUri || !pOIProtSink || !pOIBindInfo)
return E_INVALIDARG;
@ -681,7 +681,7 @@ static HRESULT WINAPI ProtocolHandler_Abort(IInternetProtocol *iface, HRESULT hr
{
BindProtocol *This = impl_from_IInternetProtocol(iface);
TRACE("(%p)->(%08x %08x)\n", This, hrReason, dwOptions);
TRACE("(%p)->(%08lx %08lx)\n", This, hrReason, dwOptions);
if(This->protocol && !This->reported_result)
return IInternetProtocol_Abort(This->protocol, hrReason, dwOptions);
@ -693,7 +693,7 @@ static HRESULT WINAPI ProtocolHandler_Terminate(IInternetProtocol *iface, DWORD
{
BindProtocol *This = impl_from_IInternetProtocol(iface);
TRACE("(%p)->(%08x)\n", This, dwOptions);
TRACE("(%p)->(%08lx)\n", This, dwOptions);
if(!This->reported_result)
return E_FAIL;
@ -747,7 +747,7 @@ static HRESULT WINAPI ProtocolHandler_Read(IInternetProtocol *iface, void *pv,
ULONG read = 0;
HRESULT hres = S_OK;
TRACE("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead);
TRACE("(%p)->(%p %lu %p)\n", This, pv, cb, pcbRead);
if(This->buf_size) {
read = min(cb, This->buf_size);
@ -796,7 +796,7 @@ static HRESULT WINAPI ProtocolHandler_Seek(IInternetProtocol *iface, LARGE_INTEG
DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition)
{
BindProtocol *This = impl_from_IInternetProtocol(iface);
FIXME("(%p)->(%d %d %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition);
FIXME("(%p)->(%ld %ld %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition);
return E_NOTIMPL;
}
@ -804,7 +804,7 @@ static HRESULT WINAPI ProtocolHandler_LockRequest(IInternetProtocol *iface, DWOR
{
BindProtocol *This = impl_from_IInternetProtocol(iface);
TRACE("(%p)->(%08x)\n", This, dwOptions);
TRACE("(%p)->(%08lx)\n", This, dwOptions);
return IInternetProtocol_LockRequest(This->protocol, dwOptions);
}
@ -909,7 +909,7 @@ static HRESULT WINAPI ProtocolSinkHandler_ReportProgress(IInternetProtocolSink *
break;
default:
FIXME("unsupported ulStatusCode %u\n", status_code);
FIXME("unsupported ulStatusCode %lu\n", status_code);
}
return S_OK;
@ -990,7 +990,7 @@ static HRESULT WINAPI ProtocolSinkHandler_ReportData(IInternetProtocolSink *ifac
BindProtocol *This = impl_from_IInternetProtocolSinkHandler(iface);
HRESULT hres;
TRACE("(%p)->(%x %u %u)\n", This, bscf, progress, progress_max);
TRACE("(%p)->(%lx %lu %lu)\n", This, bscf, progress, progress_max);
This->bscf = bscf;
This->progress = progress;
@ -1039,7 +1039,7 @@ static HRESULT WINAPI ProtocolSinkHandler_ReportResult(IInternetProtocolSink *if
{
BindProtocol *This = impl_from_IInternetProtocolSinkHandler(iface);
TRACE("(%p)->(%08x %d %s)\n", This, hrResult, dwError, debugstr_w(szResult));
TRACE("(%p)->(%08lx %ld %s)\n", This, hrResult, dwError, debugstr_w(szResult));
if(hrResult == INET_E_REDIRECT_FAILED) {
hrResult = handle_redirect(This, szResult);
@ -1097,7 +1097,7 @@ static HRESULT WINAPI BindInfo_GetBindInfo(IInternetBindInfo *iface,
hres = IInternetBindInfo_GetBindInfo(This->bind_info, grfBINDF, pbindinfo);
if(FAILED(hres)) {
WARN("GetBindInfo failed: %08x\n", hres);
WARN("GetBindInfo failed: %08lx\n", hres);
return hres;
}
@ -1121,7 +1121,7 @@ static HRESULT WINAPI BindInfo_GetBindString(IInternetBindInfo *iface,
{
BindProtocol *This = impl_from_IInternetBindInfo(iface);
TRACE("(%p)->(%d %p %d %p)\n", This, ulStringType, ppwzStr, cEl, pcElFetched);
TRACE("(%p)->(%ld %p %ld %p)\n", This, ulStringType, ppwzStr, cEl, pcElFetched);
return IInternetBindInfo_GetBindString(This->bind_info, ulStringType, ppwzStr, cEl, pcElFetched);
}
@ -1162,7 +1162,7 @@ static HRESULT WINAPI InternetPriority_SetPriority(IInternetPriority *iface, LON
{
BindProtocol *This = impl_from_IInternetPriority(iface);
TRACE("(%p)->(%d)\n", This, nPriority);
TRACE("(%p)->(%ld)\n", This, nPriority);
This->priority = nPriority;
return S_OK;
@ -1233,7 +1233,7 @@ static HRESULT WINAPI BPInternetProtocolSink_Switch(IInternetProtocolSink *iface
TRACE("(%p)->(%p)\n", This, pProtocolData);
TRACE("flags %x state %x data %p cb %u\n", pProtocolData->grfFlags, pProtocolData->dwState,
TRACE("flags %lx state %lx data %p cb %lu\n", pProtocolData->grfFlags, pProtocolData->dwState,
pProtocolData->pData, pProtocolData->cbData);
data = heap_alloc(sizeof(PROTOCOLDATA));
@ -1283,7 +1283,7 @@ static HRESULT WINAPI BPInternetProtocolSink_ReportProgress(IInternetProtocolSin
{
BindProtocol *This = impl_from_IInternetProtocolSink(iface);
TRACE("(%p)->(%u %s)\n", This, ulStatusCode, debugstr_w(szStatusText));
TRACE("(%p)->(%lu %s)\n", This, ulStatusCode, debugstr_w(szStatusText));
if(do_direct_notif(This)) {
IInternetProtocolSink_ReportProgress(This->protocol_sink_handler, ulStatusCode, szStatusText);
@ -1323,7 +1323,7 @@ static HRESULT WINAPI BPInternetProtocolSink_ReportData(IInternetProtocolSink *i
{
BindProtocol *This = impl_from_IInternetProtocolSink(iface);
TRACE("(%p)->(%x %u %u)\n", This, grfBSCF, ulProgress, ulProgressMax);
TRACE("(%p)->(%lx %lu %lu)\n", This, grfBSCF, ulProgress, ulProgressMax);
if(!This->protocol_sink)
return S_OK;
@ -1370,7 +1370,7 @@ static HRESULT WINAPI BPInternetProtocolSink_ReportResult(IInternetProtocolSink
{
BindProtocol *This = impl_from_IInternetProtocolSink(iface);
TRACE("(%p)->(%08x %d %s)\n", This, hrResult, dwError, debugstr_w(szResult));
TRACE("(%p)->(%08lx %ld %s)\n", This, hrResult, dwError, debugstr_w(szResult));
if(!This->protocol_sink)
return E_FAIL;

22
dlls/urlmon/download.c
View File

@ -79,7 +79,7 @@ static ULONG WINAPI DownloadBSC_AddRef(IBindStatusCallback *iface)
DownloadBSC *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;
}
@ -89,7 +89,7 @@ static ULONG WINAPI DownloadBSC_Release(IBindStatusCallback *iface)
DownloadBSC *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->callback)
@ -110,7 +110,7 @@ static HRESULT WINAPI DownloadBSC_OnStartBinding(IBindStatusCallback *iface,
DownloadBSC *This = impl_from_IBindStatusCallback(iface);
HRESULT hres = S_OK;
TRACE("(%p)->(%d %p)\n", This, dwReserved, pbind);
TRACE("(%p)->(%ld %p)\n", This, dwReserved, pbind);
if(This->callback) {
hres = IBindStatusCallback_OnStartBinding(This->callback, dwReserved, pbind);
@ -133,7 +133,7 @@ static HRESULT WINAPI DownloadBSC_GetPriority(IBindStatusCallback *iface, LONG *
static HRESULT WINAPI DownloadBSC_OnLowResource(IBindStatusCallback *iface, DWORD reserved)
{
DownloadBSC *This = impl_from_IBindStatusCallback(iface);
FIXME("(%p)->(%d)\n", This, reserved);
FIXME("(%p)->(%ld)\n", This, reserved);
return E_NOTIMPL;
}
@ -161,7 +161,7 @@ static HRESULT WINAPI DownloadBSC_OnProgress(IBindStatusCallback *iface, ULONG u
DownloadBSC *This = impl_from_IBindStatusCallback(iface);
HRESULT hres = S_OK;
TRACE("%p)->(%u %u %u %s)\n", This, ulProgress, ulProgressMax, ulStatusCode,
TRACE("%p)->(%lu %lu %lu %s)\n", This, ulProgress, ulProgressMax, ulStatusCode,
debugstr_w(szStatusText));
switch(ulStatusCode) {
@ -183,7 +183,7 @@ static HRESULT WINAPI DownloadBSC_OnProgress(IBindStatusCallback *iface, ULONG u
break;
default:
FIXME("Unsupported status %u\n", ulStatusCode);
FIXME("Unsupported status %lu\n", ulStatusCode);
}
return hres;
@ -195,7 +195,7 @@ static HRESULT WINAPI DownloadBSC_OnStopBinding(IBindStatusCallback *iface,
DownloadBSC *This = impl_from_IBindStatusCallback(iface);
HRESULT hres = S_OK;
TRACE("(%p)->(%08x %s)\n", This, hresult, debugstr_w(szError));
TRACE("(%p)->(%08lx %s)\n", This, hresult, debugstr_w(szError));
if(This->file_name) {
if(This->cache_file) {
@ -203,7 +203,7 @@ static HRESULT WINAPI DownloadBSC_OnStopBinding(IBindStatusCallback *iface,
b = CopyFileW(This->cache_file, This->file_name, FALSE);
if(!b)
FIXME("CopyFile failed: %u\n", GetLastError());
FIXME("CopyFile failed: %lu\n", GetLastError());
}else {
FIXME("No cache file\n");
}
@ -251,7 +251,7 @@ static HRESULT WINAPI DownloadBSC_OnDataAvailable(IBindStatusCallback *iface,
{
DownloadBSC *This = impl_from_IBindStatusCallback(iface);
TRACE("(%p)->(%08x %d %p %p)\n", This, grfBSCF, dwSize, pformatetc, pstgmed);
TRACE("(%p)->(%08lx %ld %p %p)\n", This, grfBSCF, dwSize, pformatetc, pstgmed);
return S_OK;
}
@ -433,7 +433,7 @@ HRESULT WINAPI URLDownloadToFileW(LPUNKNOWN pCaller, LPCWSTR szURL, LPCWSTR szFi
IBindCtx *bindctx;
HRESULT hres;
TRACE("(%p %s %s %d %p)\n", pCaller, debugstr_w(szURL), debugstr_w(szFileName), dwReserved, lpfnCB);
TRACE("(%p %s %s %ld %p)\n", pCaller, debugstr_w(szURL), debugstr_w(szFileName), dwReserved, lpfnCB);
if(pCaller)
FIXME("pCaller not supported\n");
@ -485,7 +485,7 @@ HRESULT WINAPI URLDownloadToFileA(LPUNKNOWN pCaller, LPCSTR szURL, LPCSTR szFile
LPWSTR urlW, file_nameW;
HRESULT hres;
TRACE("(%p %s %s %d %p)\n", pCaller, debugstr_a(szURL), debugstr_a(szFileName), dwReserved, lpfnCB);
TRACE("(%p %s %s %ld %p)\n", pCaller, debugstr_a(szURL), debugstr_a(szFileName), dwReserved, lpfnCB);
urlW = heap_strdupAtoW(szURL);
file_nameW = heap_strdupAtoW(szFileName);

24
dlls/urlmon/file.c
View File

@ -88,7 +88,7 @@ static ULONG WINAPI FileProtocolUnk_AddRef(IUnknown *iface)
{
FileProtocol *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;
}
@ -97,7 +97,7 @@ static ULONG WINAPI FileProtocolUnk_Release(IUnknown *iface)
FileProtocol *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->file != INVALID_HANDLE_VALUE)
@ -145,7 +145,7 @@ static HRESULT WINAPI FileProtocol_Start(IInternetProtocolEx *iface, LPCWSTR szU
IUri *uri;
HRESULT hres;
TRACE("(%p)->(%s %p %p %08x %lx)\n", This, debugstr_w(szUrl), pOIProtSink,
TRACE("(%p)->(%s %p %p %08lx %Ix)\n", This, debugstr_w(szUrl), pOIProtSink,
pOIBindInfo, grfPI, dwReserved);
hres = CreateUri(szUrl, Uri_CREATE_FILE_USE_DOS_PATH, 0, &uri);
@ -170,7 +170,7 @@ static HRESULT WINAPI FileProtocol_Abort(IInternetProtocolEx *iface, HRESULT hrR
DWORD dwOptions)
{
FileProtocol *This = impl_from_IInternetProtocolEx(iface);
FIXME("(%p)->(%08x %08x)\n", This, hrReason, dwOptions);
FIXME("(%p)->(%08lx %08lx)\n", This, hrReason, dwOptions);
return E_NOTIMPL;
}
@ -178,7 +178,7 @@ static HRESULT WINAPI FileProtocol_Terminate(IInternetProtocolEx *iface, DWORD d
{
FileProtocol *This = impl_from_IInternetProtocolEx(iface);
TRACE("(%p)->(%08x)\n", This, dwOptions);
TRACE("(%p)->(%08lx)\n", This, dwOptions);
return S_OK;
}
@ -203,7 +203,7 @@ static HRESULT WINAPI FileProtocol_Read(IInternetProtocolEx *iface, void *pv,
FileProtocol *This = impl_from_IInternetProtocolEx(iface);
DWORD read = 0;
TRACE("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead);
TRACE("(%p)->(%p %lu %p)\n", This, pv, cb, pcbRead);
if (pcbRead)
*pcbRead = 0;
@ -224,7 +224,7 @@ static HRESULT WINAPI FileProtocol_Seek(IInternetProtocolEx *iface, LARGE_INTEGE
DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition)
{
FileProtocol *This = impl_from_IInternetProtocolEx(iface);
FIXME("(%p)->(%d %d %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition);
FIXME("(%p)->(%ld %ld %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition);
return E_NOTIMPL;
}
@ -232,7 +232,7 @@ static HRESULT WINAPI FileProtocol_LockRequest(IInternetProtocolEx *iface, DWORD
{
FileProtocol *This = impl_from_IInternetProtocolEx(iface);
TRACE("(%p)->(%08x)\n", This, dwOptions);
TRACE("(%p)->(%08lx)\n", This, dwOptions);
return S_OK;
}
@ -267,7 +267,7 @@ static HRESULT WINAPI FileProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUr
BSTR ext;
HRESULT hres;
TRACE("(%p)->(%p %p %p %08x %p)\n", This, pUri, pOIProtSink,
TRACE("(%p)->(%p %p %p %08lx %p)\n", This, pUri, pOIProtSink,
pOIBindInfo, grfPI, dwReserved);
if(!pUri)
@ -284,7 +284,7 @@ static HRESULT WINAPI FileProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUr
bindinfo.cbSize = sizeof(BINDINFO);
hres = IInternetBindInfo_GetBindInfo(pOIBindInfo, &grfBINDF, &bindinfo);
if(FAILED(hres)) {
WARN("GetBindInfo failed: %08x\n", hres);
WARN("GetBindInfo failed: %08lx\n", hres);
return hres;
}
@ -305,7 +305,7 @@ static HRESULT WINAPI FileProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUr
size = 0;
hres = CoInternetParseIUri(pUri, PARSE_PATH_FROM_URL, 0, path, ARRAY_SIZE(path), &size, 0);
if(FAILED(hres)) {
WARN("CoInternetParseIUri failed: %08x\n", hres);
WARN("CoInternetParseIUri failed: %08lx\n", hres);
return report_result(pOIProtSink, hres, 0);
}
@ -393,7 +393,7 @@ static HRESULT WINAPI FilePriority_SetPriority(IInternetPriority *iface, LONG nP
{
FileProtocol *This = impl_from_IInternetPriority(iface);
TRACE("(%p)->(%d)\n", This, nPriority);
TRACE("(%p)->(%ld)\n", This, nPriority);
This->priority = nPriority;
return S_OK;

10
dlls/urlmon/format.c
View File

@ -62,7 +62,7 @@ static ULONG WINAPI EnumFORMATETC_AddRef(IEnumFORMATETC *iface)
{
EnumFORMATETC *This = impl_from_IEnumFORMATETC(iface);
LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref);
TRACE("(%p) ref=%ld\n", This, ref);
return ref;
}
@ -71,7 +71,7 @@ static ULONG WINAPI EnumFORMATETC_Release(IEnumFORMATETC *iface)
EnumFORMATETC *This = impl_from_IEnumFORMATETC(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->fetc);
@ -89,7 +89,7 @@ static HRESULT WINAPI EnumFORMATETC_Next(IEnumFORMATETC *iface, ULONG celt,
EnumFORMATETC *This = impl_from_IEnumFORMATETC(iface);
ULONG cnt;
TRACE("(%p)->(%d %p %p)\n", This, celt, rgelt, pceltFetched);
TRACE("(%p)->(%ld %p %p)\n", This, celt, rgelt, pceltFetched);
if(!rgelt)
return E_INVALIDARG;
@ -115,7 +115,7 @@ static HRESULT WINAPI EnumFORMATETC_Skip(IEnumFORMATETC *iface, ULONG celt)
{
EnumFORMATETC *This = impl_from_IEnumFORMATETC(iface);
TRACE("(%p)->(%d)\n", This, celt);
TRACE("(%p)->(%ld)\n", This, celt);
This->it += celt;
return This->it > This->fetc_cnt ? S_FALSE : S_OK;
@ -193,7 +193,7 @@ HRESULT WINAPI CreateFormatEnumerator(UINT cfmtetc, FORMATETC *rgfmtetc,
*/
HRESULT WINAPI RegisterFormatEnumerator(LPBC pBC, IEnumFORMATETC *pEFetc, DWORD reserved)
{
TRACE("(%p %p %d)\n", pBC, pEFetc, reserved);
TRACE("(%p %p %ld)\n", pBC, pEFetc, reserved);
if(reserved)
WARN("reserved != 0\n");

30
dlls/urlmon/ftp.c
View File

@ -80,7 +80,7 @@ static HRESULT FtpProtocol_open_request(Protocol *prot, IUri *uri, DWORD request
request_flags|INTERNET_FLAG_EXISTING_CONNECT|INTERNET_FLAG_PASSIVE,
(DWORD_PTR)&This->base);
if (!This->base.request && GetLastError() != ERROR_IO_PENDING) {
WARN("InternetOpenUrl failed: %d\n", GetLastError());
WARN("InternetOpenUrl failed: %ld\n", GetLastError());
hres = INET_E_RESOURCE_NOT_FOUND;
}
}
@ -103,7 +103,7 @@ static HRESULT FtpProtocol_start_downloading(Protocol *prot)
if(res)
This->base.content_length = size;
else
WARN("FtpGetFileSize failed: %d\n", GetLastError());
WARN("FtpGetFileSize failed: %ld\n", GetLastError());
return S_OK;
}
@ -114,7 +114,7 @@ static void FtpProtocol_close_connection(Protocol *prot)
static void FtpProtocol_on_error(Protocol *prot, DWORD error)
{
FIXME("(%p) %d - stub\n", prot, error);
FIXME("(%p) %ld - stub\n", prot, error);
}
static const ProtocolVtbl AsyncProtocolVtbl = {
@ -164,7 +164,7 @@ static ULONG WINAPI FtpProtocolUnk_AddRef(IUnknown *iface)
{
FtpProtocol *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;
}
@ -173,7 +173,7 @@ static ULONG WINAPI FtpProtocolUnk_Release(IUnknown *iface)
FtpProtocol *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) {
protocol_close_connection(&This->base);
@ -220,7 +220,7 @@ static HRESULT WINAPI FtpProtocol_Start(IInternetProtocolEx *iface, LPCWSTR szUr
IUri *uri;
HRESULT hres;
TRACE("(%p)->(%s %p %p %08x %lx)\n", This, debugstr_w(szUrl), pOIProtSink,
TRACE("(%p)->(%s %p %p %08lx %Ix)\n", This, debugstr_w(szUrl), pOIProtSink,
pOIBindInfo, grfPI, dwReserved);
hres = CreateUri(szUrl, 0, 0, &uri);
@ -248,7 +248,7 @@ static HRESULT WINAPI FtpProtocol_Abort(IInternetProtocolEx *iface, HRESULT hrRe
{
FtpProtocol *This = impl_from_IInternetProtocolEx(iface);
TRACE("(%p)->(%08x %08x)\n", This, hrReason, dwOptions);
TRACE("(%p)->(%08lx %08lx)\n", This, hrReason, dwOptions);
return protocol_abort(&This->base, hrReason);
}
@ -257,7 +257,7 @@ static HRESULT WINAPI FtpProtocol_Terminate(IInternetProtocolEx *iface, DWORD dw
{
FtpProtocol *This = impl_from_IInternetProtocolEx(iface);
TRACE("(%p)->(%08x)\n", This, dwOptions);
TRACE("(%p)->(%08lx)\n", This, dwOptions);
protocol_close_connection(&This->base);
return S_OK;
@ -282,7 +282,7 @@ static HRESULT WINAPI FtpProtocol_Read(IInternetProtocolEx *iface, void *pv,
{
FtpProtocol *This = impl_from_IInternetProtocolEx(iface);
TRACE("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead);
TRACE("(%p)->(%p %lu %p)\n", This, pv, cb, pcbRead);
return protocol_read(&This->base, pv, cb, pcbRead);
}
@ -291,7 +291,7 @@ static HRESULT WINAPI FtpProtocol_Seek(IInternetProtocolEx *iface, LARGE_INTEGER
DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition)
{
FtpProtocol *This = impl_from_IInternetProtocolEx(iface);
FIXME("(%p)->(%d %d %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition);
FIXME("(%p)->(%ld %ld %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition);
return E_NOTIMPL;
}
@ -299,7 +299,7 @@ static HRESULT WINAPI FtpProtocol_LockRequest(IInternetProtocolEx *iface, DWORD
{
FtpProtocol *This = impl_from_IInternetProtocolEx(iface);
TRACE("(%p)->(%08x)\n", This, dwOptions);
TRACE("(%p)->(%08lx)\n", This, dwOptions);
return protocol_lock_request(&This->base);
}
@ -321,7 +321,7 @@ static HRESULT WINAPI FtpProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUri
DWORD scheme = 0;
HRESULT hres;
TRACE("(%p)->(%p %p %p %08x %p)\n", This, pUri, pOIProtSink,
TRACE("(%p)->(%p %p %p %08lx %p)\n", This, pUri, pOIProtSink,
pOIBindInfo, grfPI, dwReserved);
hres = IUri_GetScheme(pUri, &scheme);
@ -373,7 +373,7 @@ static HRESULT WINAPI FtpPriority_SetPriority(IInternetPriority *iface, LONG nPr
{
FtpProtocol *This = impl_from_IInternetPriority(iface);
TRACE("(%p)->(%d)\n", This, nPriority);
TRACE("(%p)->(%ld)\n", This, nPriority);
This->base.priority = nPriority;
return S_OK;
@ -419,7 +419,7 @@ static HRESULT WINAPI HttpInfo_QueryOption(IWinInetHttpInfo *iface, DWORD dwOpti
void *pBuffer, DWORD *pcbBuffer)
{
FtpProtocol *This = impl_from_IWinInetHttpInfo(iface);
TRACE("(%p)->(%x %p %p)\n", This, dwOption, pBuffer, pcbBuffer);
TRACE("(%p)->(%lx %p %p)\n", This, dwOption, pBuffer, pcbBuffer);
if(!This->base.request)
return E_FAIL;
@ -433,7 +433,7 @@ static HRESULT WINAPI HttpInfo_QueryInfo(IWinInetHttpInfo *iface, DWORD dwOption
void *pBuffer, DWORD *pcbBuffer, DWORD *pdwFlags, DWORD *pdwReserved)
{
FtpProtocol *This = impl_from_IWinInetHttpInfo(iface);
TRACE("(%p)->(%x %p %p %p %p)\n", This, dwOption, pBuffer, pcbBuffer, pdwFlags, pdwReserved);
TRACE("(%p)->(%lx %p %p %p %p)\n", This, dwOption, pBuffer, pcbBuffer, pdwFlags, pdwReserved);
if(!This->base.request)
return E_FAIL;

22
dlls/urlmon/gopher.c
View File

@ -50,7 +50,7 @@ static HRESULT GopherProtocol_open_request(Protocol *prot, IUri *uri, DWORD requ
request_flags, (DWORD_PTR)&This->base);
SysFreeString(url);
if (!This->base.request && GetLastError() != ERROR_IO_PENDING) {
WARN("InternetOpenUrl failed: %d\n", GetLastError());
WARN("InternetOpenUrl failed: %ld\n", GetLastError());
return INET_E_RESOURCE_NOT_FOUND;
}
@ -73,7 +73,7 @@ static void GopherProtocol_close_connection(Protocol *prot)
static void GopherProtocol_on_error(Protocol *prot, DWORD error)
{
FIXME("(%p) %d - stub\n", prot, error);
FIXME("(%p) %ld - stub\n", prot, error);
}
static const ProtocolVtbl AsyncProtocolVtbl = {
@ -121,7 +121,7 @@ static ULONG WINAPI GopherProtocol_AddRef(IInternetProtocol *iface)
{
GopherProtocol *This = impl_from_IInternetProtocol(iface);
LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref);
TRACE("(%p) ref=%ld\n", This, ref);
return ref;
}
@ -130,7 +130,7 @@ static ULONG WINAPI GopherProtocol_Release(IInternetProtocol *iface)
GopherProtocol *This = impl_from_IInternetProtocol(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);
@ -149,7 +149,7 @@ static HRESULT WINAPI GopherProtocol_Start(IInternetProtocol *iface, LPCWSTR szU
IUri *uri;
HRESULT hres;
TRACE("(%p)->(%s %p %p %08x %lx)\n", This, debugstr_w(szUrl), pOIProtSink,
TRACE("(%p)->(%s %p %p %08lx %Ix)\n", This, debugstr_w(szUrl), pOIProtSink,
pOIBindInfo, grfPI, dwReserved);
hres = CreateUri(szUrl, 0, 0, &uri);
@ -177,7 +177,7 @@ static HRESULT WINAPI GopherProtocol_Abort(IInternetProtocol *iface, HRESULT hrR
{
GopherProtocol *This = impl_from_IInternetProtocol(iface);
TRACE("(%p)->(%08x %08x)\n", This, hrReason, dwOptions);
TRACE("(%p)->(%08lx %08lx)\n", This, hrReason, dwOptions);
return protocol_abort(&This->base, hrReason);
}
@ -186,7 +186,7 @@ static HRESULT WINAPI GopherProtocol_Terminate(IInternetProtocol *iface, DWORD d
{
GopherProtocol *This = impl_from_IInternetProtocol(iface);
TRACE("(%p)->(%08x)\n", This, dwOptions);
TRACE("(%p)->(%08lx)\n", This, dwOptions);
protocol_close_connection(&This->base);
return S_OK;
@ -211,7 +211,7 @@ static HRESULT WINAPI GopherProtocol_Read(IInternetProtocol *iface, void *pv,
{
GopherProtocol *This = impl_from_IInternetProtocol(iface);
TRACE("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead);
TRACE("(%p)->(%p %lu %p)\n", This, pv, cb, pcbRead);
return protocol_read(&This->base, pv, cb, pcbRead);
}
@ -220,7 +220,7 @@ static HRESULT WINAPI GopherProtocol_Seek(IInternetProtocol *iface, LARGE_INTEGE
DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition)
{
GopherProtocol *This = impl_from_IInternetProtocol(iface);
FIXME("(%p)->(%d %d %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition);
FIXME("(%p)->(%ld %ld %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition);
return E_NOTIMPL;
}
@ -228,7 +228,7 @@ static HRESULT WINAPI GopherProtocol_LockRequest(IInternetProtocol *iface, DWORD
{
GopherProtocol *This = impl_from_IInternetProtocol(iface);
TRACE("(%p)->(%08x)\n", This, dwOptions);
TRACE("(%p)->(%08lx)\n", This, dwOptions);
return protocol_lock_request(&This->base);
}
@ -285,7 +285,7 @@ static HRESULT WINAPI GopherPriority_SetPriority(IInternetPriority *iface, LONG
{
GopherProtocol *This = impl_from_IInternetPriority(iface);
TRACE("(%p)->(%d)\n", This, nPriority);
TRACE("(%p)->(%ld)\n", This, nPriority);
This->base.priority = nPriority;
return S_OK;

72
dlls/urlmon/http.c
View File

@ -79,7 +79,7 @@ static LPWSTR query_http_info(HttpProtocol *This, DWORD option)
res = HttpQueryInfoW(This->base.request, option, ret, &len, NULL);
}
if(!res) {
TRACE("HttpQueryInfoW(%d) failed: %08x\n", option, GetLastError());
TRACE("HttpQueryInfoW(%ld) failed: %08lx\n", option, GetLastError());
heap_free(ret);
return NULL;
}
@ -93,7 +93,7 @@ static inline BOOL set_security_flag(HttpProtocol *This, DWORD flags)
res = InternetSetOptionW(This->base.request, INTERNET_OPTION_SECURITY_FLAGS, &flags, sizeof(flags));
if(!res)
ERR("Failed to set security flags: %x\n", flags);
ERR("Failed to set security flags: %lx\n", flags);
return res;
}
@ -132,7 +132,7 @@ static HRESULT handle_http_error(HttpProtocol *This, DWORD error)
DWORD res;
HRESULT hres;
TRACE("(%p %u)\n", This, error);
TRACE("(%p %lu)\n", This, error);
switch(error) {
case ERROR_INTERNET_SEC_CERT_DATE_INVALID:
@ -167,7 +167,7 @@ static HRESULT handle_http_error(HttpProtocol *This, DWORD error)
hres = IHttpSecurity_OnSecurityProblem(http_security, error);
IHttpSecurity_Release(http_security);
TRACE("OnSecurityProblem returned %08x\n", hres);
TRACE("OnSecurityProblem returned %08lx\n", hres);
if(hres != S_FALSE)
{
@ -186,7 +186,7 @@ static HRESULT handle_http_error(HttpProtocol *This, DWORD error)
if(res)
return RPC_E_RETRY;
FIXME("Don't know how to ignore error %d\n", error);
FIXME("Don't know how to ignore error %ld\n", error);
return E_ABORT;
}
@ -268,7 +268,7 @@ static ULONG send_http_request(HttpProtocol *This)
break;
}
default:
FIXME("Unsupported This->base.bind_info.stgmedData.tymed %d\n", This->base.bind_info.stgmedData.tymed);
FIXME("Unsupported This->base.bind_info.stgmedData.tymed %ld\n", This->base.bind_info.stgmedData.tymed);
}
}
@ -330,7 +330,7 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, IUri *uri, DWORD reques
if(FAILED(hres))
return hres;
if(!This->base.connection) {
WARN("InternetConnect failed: %d\n", GetLastError());
WARN("InternetConnect failed: %ld\n", GetLastError());
return INET_E_CANNOT_CONNECT;
}
@ -351,7 +351,7 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, IUri *uri, DWORD reques
}else if(hres == S_OK) {
accept_types = (const WCHAR**)accept_mimes;
}else {
WARN("GetBindString BINDSTRING_ACCEPT_MIMES failed: %08x\n", hres);
WARN("GetBindString BINDSTRING_ACCEPT_MIMES failed: %08lx\n", hres);
return INET_E_NO_VALID_MEDIA;
}
accept_mimes[num] = 0;
@ -372,21 +372,21 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, IUri *uri, DWORD reques
if(FAILED(hres))
return hres;
if (!This->base.request) {
WARN("HttpOpenRequest failed: %d\n", GetLastError());
WARN("HttpOpenRequest failed: %ld\n", GetLastError());
return INET_E_RESOURCE_NOT_FOUND;
}
hres = IInternetProtocolSink_QueryInterface(This->base.protocol_sink, &IID_IServiceProvider,
(void **)&service_provider);
if (hres != S_OK) {
WARN("IInternetProtocolSink_QueryInterface IID_IServiceProvider failed: %08x\n", hres);
WARN("IInternetProtocolSink_QueryInterface IID_IServiceProvider failed: %08lx\n", hres);
return hres;
}
hres = IServiceProvider_QueryService(service_provider, &IID_IHttpNegotiate,
&IID_IHttpNegotiate, (void **)&This->http_negotiate);
if (hres != S_OK) {
WARN("IServiceProvider_QueryService IID_IHttpNegotiate failed: %08x\n", hres);
WARN("IServiceProvider_QueryService IID_IHttpNegotiate failed: %08lx\n", hres);
IServiceProvider_Release(service_provider);
return hres;
}
@ -401,7 +401,7 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, IUri *uri, DWORD reques
0, &addl_header);
SysFreeString(url);
if(hres != S_OK) {
WARN("IHttpNegotiate_BeginningTransaction failed: %08x\n", hres);
WARN("IHttpNegotiate_BeginningTransaction failed: %08lx\n", hres);
IServiceProvider_Release(service_provider);
return hres;
}
@ -423,14 +423,14 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, IUri *uri, DWORD reques
&IID_IHttpNegotiate2, (void **)&http_negotiate2);
IServiceProvider_Release(service_provider);
if(hres != S_OK) {
WARN("IServiceProvider_QueryService IID_IHttpNegotiate2 failed: %08x\n", hres);
WARN("IServiceProvider_QueryService IID_IHttpNegotiate2 failed: %08lx\n", hres);
/* No goto done as per native */
}else {
len = ARRAY_SIZE(security_id);
hres = IHttpNegotiate2_GetRootSecurityId(http_negotiate2, security_id, &len, 0);
IHttpNegotiate2_Release(http_negotiate2);
if (hres != S_OK)
WARN("IHttpNegotiate2_GetRootSecurityId failed: %08x\n", hres);
WARN("IHttpNegotiate2_GetRootSecurityId failed: %08lx\n", hres);
}
/* FIXME: Handle security_id. Native calls undocumented function IsHostInProxyBypassList. */
@ -441,7 +441,7 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, IUri *uri, DWORD reques
if(hres == S_OK && num) {
if(!InternetSetOptionW(This->base.request, INTERNET_OPTION_SECONDARY_CACHE_KEY,
post_cookie, lstrlenW(post_cookie)))
WARN("InternetSetOption INTERNET_OPTION_SECONDARY_CACHE_KEY failed: %d\n", GetLastError());
WARN("InternetSetOption INTERNET_OPTION_SECONDARY_CACHE_KEY failed: %ld\n", GetLastError());
CoTaskMemFree(post_cookie);
}
}
@ -449,12 +449,12 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, IUri *uri, DWORD reques
flags = INTERNET_ERROR_MASK_COMBINED_SEC_CERT;
res = InternetSetOptionW(This->base.request, INTERNET_OPTION_ERROR_MASK, &flags, sizeof(flags));
if(!res)
WARN("InternetSetOption(INTERNET_OPTION_ERROR_MASK) failed: %u\n", GetLastError());
WARN("InternetSetOption(INTERNET_OPTION_ERROR_MASK) failed: %lu\n", GetLastError());
b = TRUE;
res = InternetSetOptionW(This->base.request, INTERNET_OPTION_HTTP_DECODING, &b, sizeof(b));
if(!res)
WARN("InternetSetOption(INTERNET_OPTION_HTTP_DECODING) failed: %u\n", GetLastError());
WARN("InternetSetOption(INTERNET_OPTION_HTTP_DECODING) failed: %lu\n", GetLastError());
do {
error = send_http_request(This);
@ -473,7 +473,7 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, IUri *uri, DWORD reques
}
} while(hres == RPC_E_RETRY);
WARN("HttpSendRequest failed: %d\n", error);
WARN("HttpSendRequest failed: %ld\n", error);
return hres;
}
@ -483,7 +483,7 @@ static HRESULT HttpProtocol_end_request(Protocol *protocol)
res = HttpEndRequestW(protocol->request, NULL, 0, 0);
if(!res && GetLastError() != ERROR_IO_PENDING) {
FIXME("HttpEndRequest failed: %u\n", GetLastError());
FIXME("HttpEndRequest failed: %lu\n", GetLastError());
return E_FAIL;
}
@ -539,12 +539,12 @@ static HRESULT HttpProtocol_start_downloading(Protocol *prot)
NULL, NULL);
heap_free(response_headers);
if (hres != S_OK) {
WARN("IHttpNegotiate_OnResponse failed: %08x\n", hres);
WARN("IHttpNegotiate_OnResponse failed: %08lx\n", hres);
return S_OK;
}
}
}else {
WARN("HttpQueryInfo failed: %d\n", GetLastError());
WARN("HttpQueryInfo failed: %ld\n", GetLastError());
}
ranges = query_http_info(This, HTTP_QUERY_ACCEPT_RANGES);
@ -565,7 +565,7 @@ static HRESULT HttpProtocol_start_downloading(Protocol *prot)
content_type);
heap_free(content_type);
}else {
WARN("HttpQueryInfo failed: %d\n", GetLastError());
WARN("HttpQueryInfo failed: %ld\n", GetLastError());
IInternetProtocolSink_ReportProgress(This->base.protocol_sink,
(This->base.bindf & BINDF_FROMURLMON)
? BINDSTATUS_MIMETYPEAVAILABLE : BINDSTATUS_RAWMIMETYPE, L"text/html");
@ -598,10 +598,10 @@ static void HttpProtocol_on_error(Protocol *prot, DWORD error)
HttpProtocol *This = impl_from_Protocol(prot);
HRESULT hres;
TRACE("(%p) %d\n", prot, error);
TRACE("(%p) %ld\n", prot, error);
if(prot->flags & FLAG_FIRST_CONTINUE_COMPLETE) {
FIXME("Not handling error %d\n", error);
FIXME("Not handling error %ld\n", error);
return;
}
@ -664,7 +664,7 @@ static ULONG WINAPI HttpProtocolUnk_AddRef(IUnknown *iface)
{
HttpProtocol *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;
}
@ -673,7 +673,7 @@ static ULONG WINAPI HttpProtocolUnk_Release(IUnknown *iface)
HttpProtocol *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) {
protocol_close_connection(&This->base);
@ -720,7 +720,7 @@ static HRESULT WINAPI HttpProtocol_Start(IInternetProtocolEx *iface, LPCWSTR szU
IUri *uri;
HRESULT hres;
TRACE("(%p)->(%s %p %p %08x %lx)\n", This, debugstr_w(szUrl), pOIProtSink,
TRACE("(%p)->(%s %p %p %08lx %Ix)\n", This, debugstr_w(szUrl), pOIProtSink,
pOIBindInfo, grfPI, dwReserved);
hres = CreateUri(szUrl, 0, 0, &uri);
@ -748,7 +748,7 @@ static HRESULT WINAPI HttpProtocol_Abort(IInternetProtocolEx *iface, HRESULT hrR
{
HttpProtocol *This = impl_from_IInternetProtocolEx(iface);
TRACE("(%p)->(%08x %08x)\n", This, hrReason, dwOptions);
TRACE("(%p)->(%08lx %08lx)\n", This, hrReason, dwOptions);
return protocol_abort(&This->base, hrReason);
}
@ -757,7 +757,7 @@ static HRESULT WINAPI HttpProtocol_Terminate(IInternetProtocolEx *iface, DWORD d
{
HttpProtocol *This = impl_from_IInternetProtocolEx(iface);
TRACE("(%p)->(%08x)\n", This, dwOptions);
TRACE("(%p)->(%08lx)\n", This, dwOptions);
protocol_close_connection(&This->base);
return S_OK;
@ -782,7 +782,7 @@ static HRESULT WINAPI HttpProtocol_Read(IInternetProtocolEx *iface, void *pv,
{
HttpProtocol *This = impl_from_IInternetProtocolEx(iface);
TRACE("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead);
TRACE("(%p)->(%p %lu %p)\n", This, pv, cb, pcbRead);
return protocol_read(&This->base, pv, cb, pcbRead);
}
@ -791,7 +791,7 @@ static HRESULT WINAPI HttpProtocol_Seek(IInternetProtocolEx *iface, LARGE_INTEGE
DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition)
{
HttpProtocol *This = impl_from_IInternetProtocolEx(iface);
FIXME("(%p)->(%d %d %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition);
FIXME("(%p)->(%ld %ld %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition);
return E_NOTIMPL;
}
@ -799,7 +799,7 @@ static HRESULT WINAPI HttpProtocol_LockRequest(IInternetProtocolEx *iface, DWORD
{
HttpProtocol *This = impl_from_IInternetProtocolEx(iface);
TRACE("(%p)->(%08x)\n", This, dwOptions);
TRACE("(%p)->(%08lx)\n", This, dwOptions);
return protocol_lock_request(&This->base);
}
@ -821,7 +821,7 @@ static HRESULT WINAPI HttpProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUr
DWORD scheme = 0;
HRESULT hres;
TRACE("(%p)->(%p %p %p %08x %p)\n", This, pUri, pOIProtSink,
TRACE("(%p)->(%p %p %p %08lx %p)\n", This, pUri, pOIProtSink,
pOIBindInfo, grfPI, dwReserved);
hres = IUri_GetScheme(pUri, &scheme);
@ -873,7 +873,7 @@ static HRESULT WINAPI HttpPriority_SetPriority(IInternetPriority *iface, LONG nP
{
HttpProtocol *This = impl_from_IInternetPriority(iface);
TRACE("(%p)->(%d)\n", This, nPriority);
TRACE("(%p)->(%ld)\n", This, nPriority);
This->base.priority = nPriority;
return S_OK;
@ -919,7 +919,7 @@ static HRESULT WINAPI HttpInfo_QueryOption(IWinInetHttpInfo *iface, DWORD dwOpti
void *pBuffer, DWORD *pcbBuffer)
{
HttpProtocol *This = impl_from_IWinInetHttpInfo(iface);
TRACE("(%p)->(%x %p %p)\n", This, dwOption, pBuffer, pcbBuffer);
TRACE("(%p)->(%lx %p %p)\n", This, dwOption, pBuffer, pcbBuffer);
if(!This->base.request)
return E_FAIL;
@ -933,7 +933,7 @@ static HRESULT WINAPI HttpInfo_QueryInfo(IWinInetHttpInfo *iface, DWORD dwOption
void *pBuffer, DWORD *pcbBuffer, DWORD *pdwFlags, DWORD *pdwReserved)
{
HttpProtocol *This = impl_from_IWinInetHttpInfo(iface);
TRACE("(%p)->(%x %p %p %p %p)\n", This, dwOption, pBuffer, pcbBuffer, pdwFlags, pdwReserved);
TRACE("(%p)->(%lx %p %p %p %p)\n", This, dwOption, pBuffer, pcbBuffer, pdwFlags, pdwReserved);
if(!This->base.request)
return E_FAIL;

44
dlls/urlmon/internet.c
View File

@ -84,7 +84,7 @@ static HRESULT parse_schema(LPCWSTR url, DWORD flags, LPWSTR result, DWORD size,
WCHAR *ptr;
DWORD len = 0;
TRACE("(%s %08x %p %d %p)\n", debugstr_w(url), flags, result, size, rsize);
TRACE("(%s %08lx %p %ld %p)\n", debugstr_w(url), flags, result, size, rsize);
if(flags)
ERR("wrong flags\n");
@ -113,7 +113,7 @@ static HRESULT parse_canonicalize_url(LPCWSTR url, DWORD flags, LPWSTR result,
DWORD prsize = size;
HRESULT hres;
TRACE("(%s %08x %p %d %p)\n", debugstr_w(url), flags, result, size, rsize);
TRACE("(%s %08lx %p %ld %p)\n", debugstr_w(url), flags, result, size, rsize);
protocol_info = get_protocol_info(url);
@ -137,7 +137,7 @@ static HRESULT parse_security_url(LPCWSTR url, DWORD flags, LPWSTR result, DWORD
IInternetProtocolInfo *protocol_info;
HRESULT hres;
TRACE("(%s %08x %p %d %p)\n", debugstr_w(url), flags, result, size, rsize);
TRACE("(%s %08lx %p %ld %p)\n", debugstr_w(url), flags, result, size, rsize);
protocol_info = get_protocol_info(url);
@ -157,7 +157,7 @@ static HRESULT parse_encode(LPCWSTR url, PARSEACTION action, DWORD flags, LPWSTR
DWORD prsize;
HRESULT hres;
TRACE("(%s %08x %p %d %p)\n", debugstr_w(url), flags, result, size, rsize);
TRACE("(%s %08lx %p %ld %p)\n", debugstr_w(url), flags, result, size, rsize);
protocol_info = get_protocol_info(url);
@ -184,7 +184,7 @@ static HRESULT parse_path_from_url(LPCWSTR url, DWORD flags, LPWSTR result, DWOR
DWORD prsize;
HRESULT hres;
TRACE("(%s %08x %p %d %p)\n", debugstr_w(url), flags, result, size, rsize);
TRACE("(%s %08lx %p %ld %p)\n", debugstr_w(url), flags, result, size, rsize);
protocol_info = get_protocol_info(url);
@ -210,7 +210,7 @@ static HRESULT parse_security_domain(LPCWSTR url, DWORD flags, LPWSTR result,
IInternetProtocolInfo *protocol_info;
HRESULT hres;
TRACE("(%s %08x %p %d %p)\n", debugstr_w(url), flags, result, size, rsize);
TRACE("(%s %08lx %p %ld %p)\n", debugstr_w(url), flags, result, size, rsize);
protocol_info = get_protocol_info(url);
@ -231,7 +231,7 @@ static HRESULT parse_domain(LPCWSTR url, DWORD flags, LPWSTR result,
IInternetProtocolInfo *protocol_info;
HRESULT hres;
TRACE("(%s %08x %p %d %p)\n", debugstr_w(url), flags, result, size, rsize);
TRACE("(%s %08lx %p %ld %p)\n", debugstr_w(url), flags, result, size, rsize);
protocol_info = get_protocol_info(url);
@ -262,7 +262,7 @@ static HRESULT parse_rootdocument(LPCWSTR url, DWORD flags, LPWSTR result,
PARSEDURLW url_info;
HRESULT hres;
TRACE("(%s %08x %p %d %p)\n", debugstr_w(url), flags, result, size, rsize);
TRACE("(%s %08lx %p %ld %p)\n", debugstr_w(url), flags, result, size, rsize);
protocol_info = get_protocol_info(url);
@ -326,7 +326,7 @@ HRESULT WINAPI CoInternetParseUrl(LPCWSTR pwzUrl, PARSEACTION ParseAction, DWORD
LPWSTR pszResult, DWORD cchResult, DWORD *pcchResult, DWORD dwReserved)
{
if(dwReserved)
WARN("dwReserved = %d\n", dwReserved);
WARN("dwReserved = %ld\n", dwReserved);
switch(ParseAction) {
case PARSE_CANONICALIZE:
@ -364,7 +364,7 @@ HRESULT WINAPI CoInternetCombineUrl(LPCWSTR pwzBaseUrl, LPCWSTR pwzRelativeUrl,
DWORD size = cchResult;
HRESULT hres;
TRACE("(%s,%s,0x%08x,%p,%d,%p,%d)\n", debugstr_w(pwzBaseUrl),
TRACE("(%s,%s,0x%08lx,%p,%ld,%p,%ld)\n", debugstr_w(pwzBaseUrl),
debugstr_w(pwzRelativeUrl), dwCombineFlags, pwzResult, cchResult, pcchResult,
dwReserved);
@ -395,7 +395,7 @@ HRESULT WINAPI CoInternetCompareUrl(LPCWSTR pwzUrl1, LPCWSTR pwzUrl2, DWORD dwCo
IInternetProtocolInfo *protocol_info;
HRESULT hres;
TRACE("(%s,%s,%08x)\n", debugstr_w(pwzUrl1), debugstr_w(pwzUrl2), dwCompareFlags);
TRACE("(%s,%s,%08lx)\n", debugstr_w(pwzUrl1), debugstr_w(pwzUrl2), dwCompareFlags);
protocol_info = get_protocol_info(pwzUrl1);
@ -422,7 +422,7 @@ HRESULT WINAPI CoInternetQueryInfo(LPCWSTR pwzUrl, QUERYOPTION QueryOption,
IInternetProtocolInfo *protocol_info;
HRESULT hres;
TRACE("(%s, %x, %x, %p, %x, %p, %x)\n", debugstr_w(pwzUrl),
TRACE("(%s, %x, %lx, %p, %lx, %p, %lx)\n", debugstr_w(pwzUrl),
QueryOption, dwQueryFlags, pvBuffer, cbBuffer, pcbBuffer, dwReserved);
protocol_info = get_protocol_info(pwzUrl);
@ -471,7 +471,7 @@ static HRESULT set_internet_feature(INTERNETFEATURELIST feature, DWORD flags, BO
return E_FAIL;
if(flags & ~supported_flags)
FIXME("Unsupported flags: %08x\n", flags & ~supported_flags);
FIXME("Unsupported flags: %08lx\n", flags & ~supported_flags);
if(flags & SET_FEATURE_ON_PROCESS)
set_feature_on_process(feature, enable);
@ -501,7 +501,7 @@ static BOOL get_feature_from_reg(HKEY feature_control, LPCWSTR feature_name, LPC
return FALSE;
if(type != REG_DWORD) {
WARN("Unexpected registry value type %d (expected REG_DWORD) for %s\n", type, debugstr_w(L"*"));
WARN("Unexpected registry value type %ld (expected REG_DWORD) for %s\n", type, debugstr_w(L"*"));
return FALSE;
}
@ -521,7 +521,7 @@ static HRESULT load_process_feature(INTERNETFEATURELIST feature)
BOOL enabled;
if (!GetModuleFileNameW(NULL, module_name, ARRAY_SIZE(module_name))) {
ERR("Failed to get module file name: %u\n", GetLastError());
ERR("Failed to get module file name: %lu\n", GetLastError());
return E_UNEXPECTED;
}
@ -594,7 +594,7 @@ static HRESULT get_internet_feature(INTERNETFEATURELIST feature, DWORD flags)
if(flags == GET_FEATURE_FROM_PROCESS)
hres = get_feature_from_process(feature);
else {
FIXME("Unsupported flags: %08x\n", flags);
FIXME("Unsupported flags: %08lx\n", flags);
hres = E_NOTIMPL;
}
@ -606,7 +606,7 @@ static HRESULT get_internet_feature(INTERNETFEATURELIST feature, DWORD flags)
*/
HRESULT WINAPI CoInternetSetFeatureEnabled(INTERNETFEATURELIST FeatureEntry, DWORD dwFlags, BOOL fEnable)
{
TRACE("(%d, %08x, %x)\n", FeatureEntry, dwFlags, fEnable);
TRACE("(%d, %08lx, %x)\n", FeatureEntry, dwFlags, fEnable);
return set_internet_feature(FeatureEntry, dwFlags, fEnable);
}
@ -615,7 +615,7 @@ HRESULT WINAPI CoInternetSetFeatureEnabled(INTERNETFEATURELIST FeatureEntry, DWO
*/
HRESULT WINAPI CoInternetIsFeatureEnabled(INTERNETFEATURELIST FeatureEntry, DWORD dwFlags)
{
TRACE("(%d, %08x)\n", FeatureEntry, dwFlags);
TRACE("(%d, %08lx)\n", FeatureEntry, dwFlags);
return get_internet_feature(FeatureEntry, dwFlags);
}
@ -628,7 +628,7 @@ HRESULT WINAPI CoInternetIsFeatureEnabledForUrl(INTERNETFEATURELIST FeatureEntry
DWORD urlaction = 0;
HRESULT hres;
TRACE("(%d %08x %s %p)\n", FeatureEntry, dwFlags, debugstr_w(szURL), pSecMgr);
TRACE("(%d %08lx %s %p)\n", FeatureEntry, dwFlags, debugstr_w(szURL), pSecMgr);
if(FeatureEntry == FEATURE_MIME_SNIFFING)
urlaction = URLACTION_FEATURE_MIME_SNIFFING;
@ -647,7 +647,7 @@ HRESULT WINAPI CoInternetIsFeatureEnabledForUrl(INTERNETFEATURELIST FeatureEntry
case GET_FEATURE_FROM_THREAD_TRUSTED:
case GET_FEATURE_FROM_THREAD_INTERNET:
case GET_FEATURE_FROM_THREAD_RESTRICTED:
FIXME("unsupported flags %x\n", dwFlags);
FIXME("unsupported flags %lx\n", dwFlags);
return E_NOTIMPL;
case GET_FEATURE_FROM_PROCESS:
@ -676,7 +676,7 @@ HRESULT WINAPI CoInternetIsFeatureZoneElevationEnabled(LPCWSTR szFromURL, LPCWST
{
HRESULT hres;
TRACE("(%s %s %p %x)\n", debugstr_w(szFromURL), debugstr_w(szToURL), pSecMgr, dwFlags);
TRACE("(%s %s %p %lx)\n", debugstr_w(szFromURL), debugstr_w(szToURL), pSecMgr, dwFlags);
if(!pSecMgr || !szToURL)
return CoInternetIsFeatureEnabled(FEATURE_ZONE_ELEVATION, dwFlags);
@ -688,7 +688,7 @@ HRESULT WINAPI CoInternetIsFeatureZoneElevationEnabled(LPCWSTR szFromURL, LPCWST
case GET_FEATURE_FROM_THREAD_TRUSTED:
case GET_FEATURE_FROM_THREAD_INTERNET:
case GET_FEATURE_FROM_THREAD_RESTRICTED:
FIXME("unsupported flags %x\n", dwFlags);
FIXME("unsupported flags %lx\n", dwFlags);
return E_NOTIMPL;
case GET_FEATURE_FROM_PROCESS:

28
dlls/urlmon/mimefilter.c
View File

@ -65,7 +65,7 @@ static ULONG WINAPI MimeFilterProtocol_AddRef(IInternetProtocol *iface)
{
MimeFilter *This = impl_from_IInternetProtocol(iface);
LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref);
TRACE("(%p) ref=%ld\n", This, ref);
return ref;
}
@ -74,7 +74,7 @@ static ULONG WINAPI MimeFilterProtocol_Release(IInternetProtocol *iface)
MimeFilter *This = impl_from_IInternetProtocol(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);
@ -90,7 +90,7 @@ static HRESULT WINAPI MimeFilterProtocol_Start(IInternetProtocol *iface, LPCWSTR
DWORD grfPI, HANDLE_PTR dwReserved)
{
MimeFilter *This = impl_from_IInternetProtocol(iface);
FIXME("(%p)->(%s %p %p %08x %lx)\n", This, debugstr_w(szUrl), pOIProtSink,
FIXME("(%p)->(%s %p %p %08lx %Ix)\n", This, debugstr_w(szUrl), pOIProtSink,
pOIBindInfo, grfPI, dwReserved);
return E_NOTIMPL;
}
@ -106,14 +106,14 @@ static HRESULT WINAPI MimeFilterProtocol_Abort(IInternetProtocol *iface, HRESULT
DWORD dwOptions)
{
MimeFilter *This = impl_from_IInternetProtocol(iface);
FIXME("(%p)->(%08x %08x)\n", This, hrReason, dwOptions);
FIXME("(%p)->(%08lx %08lx)\n", This, hrReason, dwOptions);
return E_NOTIMPL;
}
static HRESULT WINAPI MimeFilterProtocol_Terminate(IInternetProtocol *iface, DWORD dwOptions)
{
MimeFilter *This = impl_from_IInternetProtocol(iface);
FIXME("(%p)->(%08x)\n", This, dwOptions);
FIXME("(%p)->(%08lx)\n", This, dwOptions);
return E_NOTIMPL;
}
@ -135,7 +135,7 @@ static HRESULT WINAPI MimeFilterProtocol_Read(IInternetProtocol *iface, void *pv
ULONG cb, ULONG *pcbRead)
{
MimeFilter *This = impl_from_IInternetProtocol(iface);
FIXME("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead);
FIXME("(%p)->(%p %lu %p)\n", This, pv, cb, pcbRead);
return E_NOTIMPL;
}
@ -143,14 +143,14 @@ static HRESULT WINAPI MimeFilterProtocol_Seek(IInternetProtocol *iface, LARGE_IN
DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition)
{
MimeFilter *This = impl_from_IInternetProtocol(iface);
FIXME("(%p)->(%d %d %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition);
FIXME("(%p)->(%ld %ld %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition);
return E_NOTIMPL;
}
static HRESULT WINAPI MimeFilterProtocol_LockRequest(IInternetProtocol *iface, DWORD dwOptions)
{
MimeFilter *This = impl_from_IInternetProtocol(iface);
FIXME("(%p)->(%08x)\n", This, dwOptions);
FIXME("(%p)->(%08lx)\n", This, dwOptions);
return E_NOTIMPL;
}
@ -213,7 +213,7 @@ static HRESULT WINAPI MimeFilterSink_ReportProgress(IInternetProtocolSink *iface
ULONG ulStatusCode, LPCWSTR szStatusText)
{
MimeFilter *This = impl_from_IInternetProtocolSink(iface);
FIXME("(%p)->(%u %s)\n", This, ulStatusCode, debugstr_w(szStatusText));
FIXME("(%p)->(%lu %s)\n", This, ulStatusCode, debugstr_w(szStatusText));
return E_NOTIMPL;
}
@ -221,7 +221,7 @@ static HRESULT WINAPI MimeFilterSink_ReportData(IInternetProtocolSink *iface,
DWORD grfBSCF, ULONG ulProgress, ULONG ulProgressMax)
{
MimeFilter *This = impl_from_IInternetProtocolSink(iface);
FIXME("(%p)->(%d %u %u)\n", This, grfBSCF, ulProgress, ulProgressMax);
FIXME("(%p)->(%ld %lu %lu)\n", This, grfBSCF, ulProgress, ulProgressMax);
return E_NOTIMPL;
}
@ -229,7 +229,7 @@ static HRESULT WINAPI MimeFilterSink_ReportResult(IInternetProtocolSink *iface,
HRESULT hrResult, DWORD dwError, LPCWSTR szResult)
{
MimeFilter *This = impl_from_IInternetProtocolSink(iface);
FIXME("(%p)->(%08x %d %s)\n", This, hrResult, dwError, debugstr_w(szResult));
FIXME("(%p)->(%08lx %ld %s)\n", This, hrResult, dwError, debugstr_w(szResult));
return E_NOTIMPL;
}
@ -656,13 +656,13 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC, LPCWSTR pwzUrl, LPVOID pBuffer,
DWORD cbSize, LPCWSTR pwzMimeProposed, DWORD dwMimeFlags,
LPWSTR* ppwzMimeOut, DWORD dwReserved)
{
TRACE("(%p,%s,%p,%d,%s,0x%x,%p,0x%x)\n", pBC, debugstr_w(pwzUrl), pBuffer, cbSize,
TRACE("(%p,%s,%p,%ld,%s,0x%lx,%p,0x%lx)\n", pBC, debugstr_w(pwzUrl), pBuffer, cbSize,
debugstr_w(pwzMimeProposed), dwMimeFlags, ppwzMimeOut, dwReserved);
if(dwMimeFlags)
WARN("dwMimeFlags=%08x\n", dwMimeFlags);
WARN("dwMimeFlags=%08lx\n", dwMimeFlags);
if(dwReserved)
WARN("dwReserved=%d\n", dwReserved);
WARN("dwReserved=%ld\n", dwReserved);
/* pBC seems to not be used */

26
dlls/urlmon/mk.c
View File

@ -74,7 +74,7 @@ static ULONG WINAPI MkProtocolUnk_AddRef(IUnknown *iface)
{
MkProtocol *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;
}
@ -83,7 +83,7 @@ static ULONG WINAPI MkProtocolUnk_Release(IUnknown *iface)
MkProtocol *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->stream)
@ -138,7 +138,7 @@ static HRESULT WINAPI MkProtocol_Start(IInternetProtocolEx *iface, LPCWSTR szUrl
HRESULT hres;
IUri *uri;
TRACE("(%p)->(%s %p %p %08x %lx)\n", This, debugstr_w(szUrl), pOIProtSink,
TRACE("(%p)->(%s %p %p %08lx %Ix)\n", This, debugstr_w(szUrl), pOIProtSink,
pOIBindInfo, grfPI, dwReserved);
hres = CreateUri(szUrl, 0, 0, &uri);
@ -163,7 +163,7 @@ static HRESULT WINAPI MkProtocol_Abort(IInternetProtocolEx *iface, HRESULT hrRea
DWORD dwOptions)
{
MkProtocol *This = impl_from_IInternetProtocolEx(iface);
FIXME("(%p)->(%08x %08x)\n", This, hrReason, dwOptions);
FIXME("(%p)->(%08lx %08lx)\n", This, hrReason, dwOptions);
return E_NOTIMPL;
}
@ -171,7 +171,7 @@ static HRESULT WINAPI MkProtocol_Terminate(IInternetProtocolEx *iface, DWORD dwO
{
MkProtocol *This = impl_from_IInternetProtocolEx(iface);
TRACE("(%p)->(%08x)\n", This, dwOptions);
TRACE("(%p)->(%08lx)\n", This, dwOptions);
return S_OK;
}
@ -195,7 +195,7 @@ static HRESULT WINAPI MkProtocol_Read(IInternetProtocolEx *iface, void *pv,
{
MkProtocol *This = impl_from_IInternetProtocolEx(iface);
TRACE("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead);
TRACE("(%p)->(%p %lu %p)\n", This, pv, cb, pcbRead);
if(!This->stream)
return E_FAIL;
@ -207,7 +207,7 @@ static HRESULT WINAPI MkProtocol_Seek(IInternetProtocolEx *iface, LARGE_INTEGER
DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition)
{
MkProtocol *This = impl_from_IInternetProtocolEx(iface);
FIXME("(%p)->(%d %d %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition);
FIXME("(%p)->(%ld %ld %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition);
return E_NOTIMPL;
}
@ -215,7 +215,7 @@ static HRESULT WINAPI MkProtocol_LockRequest(IInternetProtocolEx *iface, DWORD d
{
MkProtocol *This = impl_from_IInternetProtocolEx(iface);
TRACE("(%p)->(%08x)\n", This, dwOptions);
TRACE("(%p)->(%08lx)\n", This, dwOptions);
return S_OK;
}
@ -244,7 +244,7 @@ static HRESULT WINAPI MkProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUri,
HRESULT hres;
CLSID clsid;
TRACE("(%p)->(%p %p %p %08x %p)\n", This, pUri, pOIProtSink,
TRACE("(%p)->(%p %p %p %08lx %p)\n", This, pUri, pOIProtSink,
pOIBindInfo, grfPI, dwReserved);
hres = IUri_GetScheme(pUri, &scheme);
@ -257,7 +257,7 @@ static HRESULT WINAPI MkProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUri,
bindinfo.cbSize = sizeof(BINDINFO);
hres = IInternetBindInfo_GetBindInfo(pOIBindInfo, &bindf, &bindinfo);
if(FAILED(hres)) {
WARN("GetBindInfo failed: %08x\n", hres);
WARN("GetBindInfo failed: %08lx\n", hres);
return hres;
}
@ -317,7 +317,7 @@ static HRESULT WINAPI MkProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUri,
heap_free(display_name);
IParseDisplayName_Release(pdn);
if(FAILED(hres)) {
WARN("ParseDisplayName failed: %08x\n", hres);
WARN("ParseDisplayName failed: %08lx\n", hres);
return report_result(pOIProtSink, hres, ERROR_INVALID_PARAMETER);
}
@ -329,13 +329,13 @@ static HRESULT WINAPI MkProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUri,
hres = IMoniker_BindToStorage(mon, NULL /* FIXME */, NULL, &IID_IStream, (void**)&This->stream);
IMoniker_Release(mon);
if(FAILED(hres)) {
WARN("BindToStorage failed: %08x\n", hres);
WARN("BindToStorage failed: %08lx\n", hres);
return report_result(pOIProtSink, hres, ERROR_INVALID_PARAMETER);
}
hres = IStream_Stat(This->stream, &statstg, STATFLAG_NONAME);
if(FAILED(hres)) {
WARN("Stat failed: %08x\n", hres);
WARN("Stat failed: %08lx\n", hres);
return report_result(pOIProtSink, hres, ERROR_INVALID_PARAMETER);
}

24
dlls/urlmon/protocol.c
View File

@ -113,7 +113,7 @@ HRESULT protocol_syncbinding(Protocol *protocol)
if(res)
protocol->available_bytes = protocol->query_available;
else
WARN("InternetQueryDataAvailable failed: %u\n", GetLastError());
WARN("InternetQueryDataAvailable failed: %lu\n", GetLastError());
protocol->flags |= FLAG_FIRST_DATA_REPORTED|FLAG_LAST_DATA_REPORTED;
IInternetProtocolSink_ReportData(protocol->protocol_sink, BSCF_LASTDATANOTIFICATION|BSCF_DATAFULLYAVAILABLE,
@ -221,7 +221,7 @@ static void WINAPI internet_status_callback(HINTERNET internet, DWORD_PTR contex
break;
default:
WARN("Unhandled Internet status callback %d\n", internet_status);
WARN("Unhandled Internet status callback %ld\n", internet_status);
}
}
@ -242,7 +242,7 @@ static HRESULT write_post_stream(Protocol *protocol)
break;
res = InternetWriteFile(protocol->request, buf, size, &written);
if(!res) {
FIXME("InternetWriteFile failed: %u\n", GetLastError());
FIXME("InternetWriteFile failed: %lu\n", GetLastError());
hres = E_FAIL;
break;
}
@ -277,7 +277,7 @@ static HINTERNET create_internet_session(IInternetBindInfo *bind_info)
heap_free(global_user_agent);
CoTaskMemFree(user_agent);
if(!ret) {
WARN("InternetOpen failed: %d\n", GetLastError());
WARN("InternetOpen failed: %ld\n", GetLastError());
return NULL;
}
@ -325,7 +325,7 @@ HRESULT protocol_start(Protocol *protocol, IInternetProtocol *prot, IUri *uri,
protocol->bind_info.cbSize = sizeof(BINDINFO);
hres = IInternetBindInfo_GetBindInfo(bind_info, &protocol->bindf, &protocol->bind_info);
if(hres != S_OK) {
WARN("GetBindInfo failed: %08x\n", hres);
WARN("GetBindInfo failed: %08lx\n", hres);
return report_result(protocol, hres);
}
@ -397,7 +397,7 @@ HRESULT protocol_continue(Protocol *protocol, PROTOCOLDATA *data)
protocol->flags &= ~FLAG_REQUEST_COMPLETE;
res = InternetQueryDataAvailable(protocol->request, &protocol->query_available, 0, 0);
if(res) {
TRACE("available %u bytes\n", protocol->query_available);
TRACE("available %lu bytes\n", protocol->query_available);
if(!protocol->query_available) {
all_data_read(protocol);
return S_OK;
@ -405,7 +405,7 @@ HRESULT protocol_continue(Protocol *protocol, PROTOCOLDATA *data)
protocol->available_bytes = protocol->query_available;
}else if(GetLastError() != ERROR_IO_PENDING) {
protocol->flags |= FLAG_REQUEST_COMPLETE;
WARN("InternetQueryDataAvailable failed: %d\n", GetLastError());
WARN("InternetQueryDataAvailable failed: %ld\n", GetLastError());
report_result(protocol, INET_E_DATA_NOT_AVAILABLE);
return S_OK;
}
@ -442,7 +442,7 @@ HRESULT protocol_read(Protocol *protocol, void *buf, ULONG size, ULONG *read_ret
res = InternetReadFile(protocol->request, ((BYTE *)buf)+read,
protocol->available_bytes > size-read ? size-read : protocol->available_bytes, &len);
if(!res) {
WARN("InternetReadFile failed: %d\n", GetLastError());
WARN("InternetReadFile failed: %ld\n", GetLastError());
hres = INET_E_DOWNLOAD_FAILURE;
report_result(protocol, hres);
break;
@ -457,7 +457,7 @@ HRESULT protocol_read(Protocol *protocol, void *buf, ULONG size, ULONG *read_ret
protocol->current_position += len;
protocol->available_bytes -= len;
TRACE("current_position %d, available_bytes %d\n", protocol->current_position, protocol->available_bytes);
TRACE("current_position %ld, available_bytes %ld\n", protocol->current_position, protocol->available_bytes);
if(!protocol->available_bytes) {
/* InternetQueryDataAvailable may immediately fork and perform its asynchronous
@ -469,7 +469,7 @@ HRESULT protocol_read(Protocol *protocol, void *buf, ULONG size, ULONG *read_ret
if (GetLastError() == ERROR_IO_PENDING) {
hres = E_PENDING;
}else {
WARN("InternetQueryDataAvailable failed: %d\n", GetLastError());
WARN("InternetQueryDataAvailable failed: %ld\n", GetLastError());
hres = INET_E_DATA_NOT_AVAILABLE;
report_result(protocol, hres);
}
@ -498,7 +498,7 @@ HRESULT protocol_read(Protocol *protocol, void *buf, ULONG size, ULONG *read_ret
HRESULT protocol_lock_request(Protocol *protocol)
{
if (!InternetLockRequestFile(protocol->request, &protocol->lock))
WARN("InternetLockRequestFile failed: %d\n", GetLastError());
WARN("InternetLockRequestFile failed: %ld\n", GetLastError());
return S_OK;
}
@ -509,7 +509,7 @@ HRESULT protocol_unlock_request(Protocol *protocol)
return S_OK;
if(!InternetUnlockRequestFile(protocol->lock))
WARN("InternetUnlockRequestFile failed: %d\n", GetLastError());
WARN("InternetUnlockRequestFile failed: %ld\n", GetLastError());
protocol->lock = 0;
return S_OK;

110
dlls/urlmon/sec_mgr.c
View File

@ -75,7 +75,7 @@ static void get_string_from_reg(HKEY hcu, HKEY hklm, LPCWSTR name, LPWSTR out, D
}
if (res) {
TRACE("%s failed: %d\n", debugstr_w(name), res);
TRACE("%s failed: %ld\n", debugstr_w(name), res);
*out = '\0';
}
}
@ -101,7 +101,7 @@ static void get_dword_from_reg(HKEY hcu, HKEY hklm, LPCWSTR name, LPDWORD out)
}
if (res) {
TRACE("%s failed: %d\n", debugstr_w(name), res);
TRACE("%s failed: %ld\n", debugstr_w(name), res);
*out = 0;
}
}
@ -242,7 +242,7 @@ static BOOL get_zone_for_scheme(HKEY key, LPCWSTR schema, DWORD *zone)
if(res == ERROR_SUCCESS) {
if(type == REG_DWORD)
return TRUE;
WARN("Unexpected value type %d for value %s, expected REG_DWORD\n", type, debugstr_w(schema));
WARN("Unexpected value type %ld for value %s, expected REG_DWORD\n", type, debugstr_w(schema));
}
/* Try to get the zone for the wildcard scheme. */
@ -252,7 +252,7 @@ static BOOL get_zone_for_scheme(HKEY key, LPCWSTR schema, DWORD *zone)
return FALSE;
if(type != REG_DWORD) {
WARN("Unexpected value type %d for value %s, expected REG_DWORD\n", type, debugstr_w(L"*"));
WARN("Unexpected value type %ld for value %s, expected REG_DWORD\n", type, debugstr_w(L"*"));
return FALSE;
}
@ -278,7 +278,7 @@ static HRESULT search_domain_for_zone(HKEY domains, LPCWSTR domain, DWORD domain
if(host_len >= domain_len && matches_domain_pattern(domain, host, TRUE, &matched)) {
res = RegOpenKeyW(domains, domain, &domain_key);
if(res != ERROR_SUCCESS) {
ERR("Failed to open domain key %s: %d\n", debugstr_w(domain), res);
ERR("Failed to open domain key %s: %ld\n", debugstr_w(domain), res);
return E_UNEXPECTED;
}
@ -294,7 +294,7 @@ static HRESULT search_domain_for_zone(HKEY domains, LPCWSTR domain, DWORD domain
res = RegQueryInfoKeyW(domain_key, NULL, NULL, NULL, &subdomain_count, &subdomain_len,
NULL, NULL, NULL, NULL, NULL, NULL);
if(res != ERROR_SUCCESS) {
ERR("Unable to query info for key %s: %d\n", debugstr_w(domain), res);
ERR("Unable to query info for key %s: %ld\n", debugstr_w(domain), res);
RegCloseKey(domain_key);
return E_UNEXPECTED;
}
@ -334,7 +334,7 @@ static HRESULT search_domain_for_zone(HKEY domains, LPCWSTR domain, DWORD domain
res = RegOpenKeyW(domain_key, subdomain, &subdomain_key);
if(res != ERROR_SUCCESS) {
ERR("Unable to open subdomain key %s of %s: %d\n", debugstr_w(subdomain),
ERR("Unable to open subdomain key %s of %s: %ld\n", debugstr_w(subdomain),
debugstr_w(domain), res);
heap_free(component);
heap_free(subdomain);
@ -663,7 +663,7 @@ static HRESULT get_action_policy(DWORD zone, DWORD action, BYTE *policy, DWORD s
}else if(res == ERROR_FILE_NOT_FOUND) {
hres = E_FAIL;
}else if(res != ERROR_SUCCESS) {
ERR("RegQueryValue failed: %d\n", res);
ERR("RegQueryValue failed: %ld\n", res);
hres = E_UNEXPECTED;
}
@ -844,7 +844,7 @@ static ULONG WINAPI SecManagerImpl_AddRef(IInternetSecurityManagerEx2* iface)
SecManagerImpl *This = impl_from_IInternetSecurityManagerEx2(iface);
ULONG refCount = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%u\n", This, refCount);
TRACE("(%p) ref=%lu\n", This, refCount);
return refCount;
}
@ -854,7 +854,7 @@ static ULONG WINAPI SecManagerImpl_Release(IInternetSecurityManagerEx2* iface)
SecManagerImpl *This = impl_from_IInternetSecurityManagerEx2(iface);
ULONG refCount = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%u\n", This, refCount);
TRACE("(%p) ref=%lu\n", This, refCount);
/* destroy the object if there are no more references on it */
if (!refCount){
@ -930,7 +930,7 @@ static HRESULT WINAPI SecManagerImpl_MapUrlToZone(IInternetSecurityManagerEx2 *i
SecManagerImpl *This = impl_from_IInternetSecurityManagerEx2(iface);
HRESULT hres;
TRACE("(%p)->(%s %p %08x)\n", iface, debugstr_w(pwszUrl), pdwZone, dwFlags);
TRACE("(%p)->(%s %p %08lx)\n", iface, debugstr_w(pwszUrl), pdwZone, dwFlags);
if(This->custom_manager) {
hres = IInternetSecurityManager_MapUrlToZone(This->custom_manager,
@ -945,7 +945,7 @@ static HRESULT WINAPI SecManagerImpl_MapUrlToZone(IInternetSecurityManagerEx2 *i
}
if(dwFlags)
FIXME("not supported flags: %08x\n", dwFlags);
FIXME("not supported flags: %08lx\n", dwFlags);
return map_url_to_zone(pwszUrl, pdwZone, NULL);
}
@ -955,7 +955,7 @@ static HRESULT WINAPI SecManagerImpl_GetSecurityId(IInternetSecurityManagerEx2 *
{
SecManagerImpl *This = impl_from_IInternetSecurityManagerEx2(iface);
TRACE("(%p)->(%s %p %p %08lx)\n", iface, debugstr_w(pwszUrl), pbSecurityId,
TRACE("(%p)->(%s %p %p %08Ix)\n", iface, debugstr_w(pwszUrl), pbSecurityId,
pcbSecurityId, dwReserved);
if(This->custom_manager) {
@ -987,7 +987,7 @@ static HRESULT WINAPI SecManagerImpl_ProcessUrlAction(IInternetSecurityManagerEx
DWORD zone, policy;
HRESULT hres;
TRACE("(%p)->(%s %08x %p %08x %p %08x %08x %08x)\n", iface, debugstr_w(pwszUrl), dwAction,
TRACE("(%p)->(%s %08lx %p %08lx %p %08lx %08lx %08lx)\n", iface, debugstr_w(pwszUrl), dwAction,
pPolicy, cbPolicy, pContext, cbContext, dwFlags, dwReserved);
if(This->custom_manager) {
@ -1011,7 +1011,7 @@ static HRESULT WINAPI SecManagerImpl_ProcessUrlAction(IInternetSecurityManagerEx
if(FAILED(hres))
return hres;
TRACE("policy %x\n", policy);
TRACE("policy %lx\n", policy);
if(cbPolicy >= sizeof(DWORD))
*(DWORD*)pPolicy = policy;
@ -1025,7 +1025,7 @@ static HRESULT WINAPI SecManagerImpl_ProcessUrlAction(IInternetSecurityManagerEx
FIXME("URLPOLICY_QUERY not implemented\n");
return E_FAIL;
default:
FIXME("Not implemented policy %x\n", policy);
FIXME("Not implemented policy %lx\n", policy);
}
return E_FAIL;
@ -1041,7 +1041,7 @@ static HRESULT WINAPI SecManagerImpl_QueryCustomPolicy(IInternetSecurityManagerE
SecManagerImpl *This = impl_from_IInternetSecurityManagerEx2(iface);
HRESULT hres;
TRACE("(%p)->(%s %s %p %p %p %08x %08x )\n", iface, debugstr_w(pwszUrl), debugstr_guid(guidKey),
TRACE("(%p)->(%s %s %p %p %p %08lx %08lx )\n", iface, debugstr_w(pwszUrl), debugstr_guid(guidKey),
ppPolicy, pcbPolicy, pContext, cbContext, dwReserved);
if(This->custom_manager) {
@ -1061,7 +1061,7 @@ static HRESULT WINAPI SecManagerImpl_SetZoneMapping(IInternetSecurityManagerEx2
SecManagerImpl *This = impl_from_IInternetSecurityManagerEx2(iface);
HRESULT hres;
TRACE("(%p)->(%08x %s %08x)\n", iface, dwZone, debugstr_w(pwszPattern),dwFlags);
TRACE("(%p)->(%08lx %s %08lx)\n", iface, dwZone, debugstr_w(pwszPattern),dwFlags);
if(This->custom_manager) {
hres = IInternetSecurityManager_SetZoneMapping(This->custom_manager, dwZone,
@ -1080,7 +1080,7 @@ static HRESULT WINAPI SecManagerImpl_GetZoneMappings(IInternetSecurityManagerEx2
SecManagerImpl *This = impl_from_IInternetSecurityManagerEx2(iface);
HRESULT hres;
TRACE("(%p)->(%08x %p %08x)\n", iface, dwZone, ppenumString,dwFlags);
TRACE("(%p)->(%08lx %p %08lx)\n", iface, dwZone, ppenumString,dwFlags);
if(This->custom_manager) {
hres = IInternetSecurityManager_GetZoneMappings(This->custom_manager, dwZone,
@ -1098,7 +1098,7 @@ static HRESULT WINAPI SecManagerImpl_ProcessUrlActionEx(IInternetSecurityManager
DWORD dwFlags, DWORD dwReserved, DWORD *pdwOutFlags)
{
SecManagerImpl *This = impl_from_IInternetSecurityManagerEx2(iface);
FIXME("(%p)->(%s %08x %p %d %p %d %08x %08x %p) stub\n", This, debugstr_w(pwszUrl), dwAction, pPolicy, cbPolicy,
FIXME("(%p)->(%s %08lx %p %ld %p %ld %08lx %08lx %p) stub\n", This, debugstr_w(pwszUrl), dwAction, pPolicy, cbPolicy,
pContext, cbContext, dwFlags, dwReserved, pdwOutFlags);
return E_NOTIMPL;
}
@ -1108,7 +1108,7 @@ static HRESULT WINAPI SecManagerImpl_MapUrlToZoneEx2(IInternetSecurityManagerEx2
{
SecManagerImpl *This = impl_from_IInternetSecurityManagerEx2(iface);
TRACE("(%p)->(%p %p %08x %p %p)\n", This, pUri, pdwZone, dwFlags, ppwszMappedUrl, pdwOutFlags);
TRACE("(%p)->(%p %p %08lx %p %p)\n", This, pUri, pdwZone, dwFlags, ppwszMappedUrl, pdwOutFlags);
if(This->custom_manager) {
HRESULT hres;
@ -1143,7 +1143,7 @@ static HRESULT WINAPI SecManagerImpl_MapUrlToZoneEx2(IInternetSecurityManagerEx2
}
if(dwFlags)
FIXME("Unsupported flags: %08x\n", dwFlags);
FIXME("Unsupported flags: %08lx\n", dwFlags);
return map_uri_to_zone(pUri, pdwZone, NULL);
}
@ -1153,7 +1153,7 @@ static HRESULT WINAPI SecManagerImpl_ProcessUrlActionEx2(IInternetSecurityManage
DWORD dwFlags, DWORD_PTR dwReserved, DWORD *pdwOutFlags)
{
SecManagerImpl *This = impl_from_IInternetSecurityManagerEx2(iface);
FIXME("(%p)->(%p %08x %p %d %p %d %08x %08x %p) stub\n", This, pUri, dwAction, pPolicy,
FIXME("(%p)->(%p %08lx %p %ld %p %ld %08lx %08lx %p) stub\n", This, pUri, dwAction, pPolicy,
cbPolicy, pContext, cbContext, dwFlags, (DWORD)dwReserved, pdwOutFlags);
return E_NOTIMPL;
}
@ -1162,7 +1162,7 @@ static HRESULT WINAPI SecManagerImpl_GetSecurityIdEx2(IInternetSecurityManagerEx
IUri *pUri, BYTE *pbSecurityId, DWORD *pcbSecurityId, DWORD_PTR dwReserved)
{
SecManagerImpl *This = impl_from_IInternetSecurityManagerEx2(iface);
TRACE("(%p)->(%p %p %p %08x) stub\n", This, pUri, pbSecurityId, pcbSecurityId, (DWORD)dwReserved);
TRACE("(%p)->(%p %p %p %08lx) stub\n", This, pUri, pbSecurityId, pcbSecurityId, (DWORD)dwReserved);
if(dwReserved)
FIXME("dwReserved is not supported yet\n");
@ -1178,7 +1178,7 @@ static HRESULT WINAPI SecManagerImpl_QueryCustomPolicyEx2(IInternetSecurityManag
DWORD cbContext, DWORD_PTR dwReserved)
{
SecManagerImpl *This = impl_from_IInternetSecurityManagerEx2(iface);
FIXME("(%p)->(%p %s %p %p %p %d %08x) stub\n", This, pUri, debugstr_guid(guidKey), ppPolicy, pcbPolicy,
FIXME("(%p)->(%p %s %p %p %p %ld %08lx) stub\n", This, pUri, debugstr_guid(guidKey), ppPolicy, pcbPolicy,
pContext, cbContext, (DWORD)dwReserved);
return E_NOTIMPL;
}
@ -1340,7 +1340,7 @@ static ULONG WINAPI ZoneMgrImpl_AddRef(IInternetZoneManagerEx2* iface)
ZoneMgrImpl* This = impl_from_IInternetZoneManagerEx2(iface);
ULONG refCount = InterlockedIncrement(&This->ref);
TRACE("(%p)->(ref before=%u)\n",This, refCount - 1);
TRACE("(%p)->(ref before=%lu)\n",This, refCount - 1);
return refCount;
}
@ -1353,7 +1353,7 @@ static ULONG WINAPI ZoneMgrImpl_Release(IInternetZoneManagerEx2* iface)
ZoneMgrImpl* This = impl_from_IInternetZoneManagerEx2(iface);
ULONG refCount = InterlockedDecrement(&This->ref);
TRACE("(%p)->(ref before=%u)\n",This, refCount + 1);
TRACE("(%p)->(ref before=%lu)\n",This, refCount + 1);
if(!refCount) {
while (This->zonemap_count) heap_free(This->zonemaps[--This->zonemap_count]);
@ -1377,7 +1377,7 @@ static HRESULT WINAPI ZoneMgrImpl_GetZoneAttributes(IInternetZoneManagerEx2* ifa
HKEY hcu;
HKEY hklm = NULL;
TRACE("(%p)->(%d %p)\n", This, dwZone, pZoneAttributes);
TRACE("(%p)->(%ld %p)\n", This, dwZone, pZoneAttributes);
if (!pZoneAttributes)
return E_INVALIDARG;
@ -1388,7 +1388,7 @@ static HRESULT WINAPI ZoneMgrImpl_GetZoneAttributes(IInternetZoneManagerEx2* ifa
hr = open_zone_key(HKEY_LOCAL_MACHINE, dwZone, &hklm);
if (FAILED(hr))
TRACE("Zone %d not in HKLM\n", dwZone);
TRACE("Zone %ld not in HKLM\n", dwZone);
get_string_from_reg(hcu, hklm, L"DisplayName", pZoneAttributes->szDisplayName, MAX_ZONE_PATH);
get_string_from_reg(hcu, hklm, L"Description", pZoneAttributes->szDescription, MAX_ZONE_DESCRIPTION);
@ -1414,7 +1414,7 @@ static HRESULT WINAPI ZoneMgrImpl_SetZoneAttributes(IInternetZoneManagerEx2* ifa
HRESULT hr;
HKEY hcu;
TRACE("(%p)->(%d %p)\n", This, dwZone, pZoneAttributes);
TRACE("(%p)->(%ld %p)\n", This, dwZone, pZoneAttributes);
if (!pZoneAttributes)
return E_INVALIDARG;
@ -1458,7 +1458,7 @@ static HRESULT WINAPI ZoneMgrImpl_GetZoneCustomPolicy(IInternetZoneManagerEx2* i
DWORD* pcbPolicy,
URLZONEREG ulrZoneReg)
{
FIXME("(%p)->(%08x %s %p %p %08x) stub\n", iface, dwZone, debugstr_guid(guidKey),
FIXME("(%p)->(%08lx %s %p %p %08x) stub\n", iface, dwZone, debugstr_guid(guidKey),
ppPolicy, pcbPolicy, ulrZoneReg);
return E_NOTIMPL;
}
@ -1473,7 +1473,7 @@ static HRESULT WINAPI ZoneMgrImpl_SetZoneCustomPolicy(IInternetZoneManagerEx2* i
DWORD cbPolicy,
URLZONEREG ulrZoneReg)
{
FIXME("(%p)->(%08x %s %p %08x %08x) stub\n", iface, dwZone, debugstr_guid(guidKey),
FIXME("(%p)->(%08lx %s %p %08lx %08x) stub\n", iface, dwZone, debugstr_guid(guidKey),
ppPolicy, cbPolicy, ulrZoneReg);
return E_NOTIMPL;
}
@ -1484,7 +1484,7 @@ static HRESULT WINAPI ZoneMgrImpl_SetZoneCustomPolicy(IInternetZoneManagerEx2* i
static HRESULT WINAPI ZoneMgrImpl_GetZoneActionPolicy(IInternetZoneManagerEx2* iface,
DWORD dwZone, DWORD dwAction, BYTE* pPolicy, DWORD cbPolicy, URLZONEREG urlZoneReg)
{
TRACE("(%p)->(%d %08x %p %d %d)\n", iface, dwZone, dwAction, pPolicy,
TRACE("(%p)->(%ld %08lx %p %ld %d)\n", iface, dwZone, dwAction, pPolicy,
cbPolicy, urlZoneReg);
if(!pPolicy)
@ -1503,7 +1503,7 @@ static HRESULT WINAPI ZoneMgrImpl_SetZoneActionPolicy(IInternetZoneManagerEx2* i
DWORD cbPolicy,
URLZONEREG urlZoneReg)
{
FIXME("(%p)->(%08x %08x %p %08x %08x) stub\n", iface, dwZone, dwAction, pPolicy,
FIXME("(%p)->(%08lx %08lx %p %08lx %08x) stub\n", iface, dwZone, dwAction, pPolicy,
cbPolicy, urlZoneReg);
return E_NOTIMPL;
}
@ -1518,7 +1518,7 @@ static HRESULT WINAPI ZoneMgrImpl_PromptAction(IInternetZoneManagerEx2* iface,
LPCWSTR pwszText,
DWORD dwPromptFlags)
{
FIXME("%p %08x %p %s %s %08x\n", iface, dwAction, hwndParent,
FIXME("%p %08lx %p %s %s %08lx\n", iface, dwAction, hwndParent,
debugstr_w(pwszUrl), debugstr_w(pwszText), dwPromptFlags );
return E_NOTIMPL;
}
@ -1532,7 +1532,7 @@ static HRESULT WINAPI ZoneMgrImpl_LogAction(IInternetZoneManagerEx2* iface,
LPCWSTR pwszText,
DWORD dwLogFlags)
{
FIXME("(%p)->(%08x %s %s %08x) stub\n", iface, dwAction, debugstr_w(pwszUrl),
FIXME("(%p)->(%08lx %s %s %08lx) stub\n", iface, dwAction, debugstr_w(pwszUrl),
debugstr_w(pwszText), dwLogFlags);
return E_NOTIMPL;
}
@ -1550,12 +1550,12 @@ static HRESULT WINAPI ZoneMgrImpl_CreateZoneEnumerator(IInternetZoneManagerEx2*
LPDWORD data;
DWORD i;
TRACE("(%p)->(%p, %p, 0x%08x)\n", This, pdwEnum, pdwCount, dwFlags);
TRACE("(%p)->(%p, %p, 0x%08lx)\n", This, pdwEnum, pdwCount, dwFlags);
if (!pdwEnum || !pdwCount || (dwFlags != 0))
return E_INVALIDARG;
data = build_zonemap_from_reg();
TRACE("found %d zones\n", data ? data[0] : -1);
TRACE("found %ld zones\n", data ? data[0] : -1);
if (!data)
return E_FAIL;
@ -1603,7 +1603,7 @@ static HRESULT WINAPI ZoneMgrImpl_GetZoneAt(IInternetZoneManagerEx2* iface,
ZoneMgrImpl* This = impl_from_IInternetZoneManagerEx2(iface);
LPDWORD data;
TRACE("(%p)->(0x%08x, %d, %p)\n", This, dwEnum, dwIndex, pdwZone);
TRACE("(%p)->(0x%08lx, %ld, %p)\n", This, dwEnum, dwIndex, pdwZone);
/* make sure, that dwEnum and dwIndex are in the valid range */
if (dwEnum < This->zonemap_count) {
@ -1626,7 +1626,7 @@ static HRESULT WINAPI ZoneMgrImpl_DestroyZoneEnumerator(IInternetZoneManagerEx2*
ZoneMgrImpl* This = impl_from_IInternetZoneManagerEx2(iface);
LPDWORD data;
TRACE("(%p)->(0x%08x)\n", This, dwEnum);
TRACE("(%p)->(0x%08lx)\n", This, dwEnum);
/* make sure, that dwEnum is valid */
if (dwEnum < This->zonemap_count) {
if ((data = This->zonemaps[dwEnum])) {
@ -1646,7 +1646,7 @@ static HRESULT WINAPI ZoneMgrImpl_CopyTemplatePoliciesToZone(IInternetZoneManage
DWORD dwZone,
DWORD dwReserved)
{
FIXME("(%p)->(%08x %08x %08x) stub\n", iface, dwTemplate, dwZone, dwReserved);
FIXME("(%p)->(%08lx %08lx %08lx) stub\n", iface, dwTemplate, dwZone, dwReserved);
return E_NOTIMPL;
}
@ -1661,14 +1661,14 @@ static HRESULT WINAPI ZoneMgrImpl_GetZoneActionPolicyEx(IInternetZoneManagerEx2*
URLZONEREG urlZoneReg,
DWORD dwFlags)
{
TRACE("(%p)->(%d, 0x%x, %p, %d, %d, 0x%x)\n", iface, dwZone,
TRACE("(%p)->(%ld, 0x%lx, %p, %ld, %d, 0x%lx)\n", iface, dwZone,
dwAction, pPolicy, cbPolicy, urlZoneReg, dwFlags);
if(!pPolicy)
return E_INVALIDARG;
if (dwFlags)
FIXME("dwFlags 0x%x ignored\n", dwFlags);
FIXME("dwFlags 0x%lx ignored\n", dwFlags);
return get_action_policy(dwZone, dwAction, pPolicy, cbPolicy, urlZoneReg);
}
@ -1684,7 +1684,7 @@ static HRESULT WINAPI ZoneMgrImpl_SetZoneActionPolicyEx(IInternetZoneManagerEx2*
URLZONEREG urlZoneReg,
DWORD dwFlags)
{
FIXME("(%p)->(%d, 0x%x, %p, %d, %d, 0x%x) stub\n", iface, dwZone, dwAction, pPolicy,
FIXME("(%p)->(%ld, 0x%lx, %p, %ld, %d, 0x%lx) stub\n", iface, dwZone, dwAction, pPolicy,
cbPolicy, urlZoneReg, dwFlags);
return E_NOTIMPL;
}
@ -1697,10 +1697,10 @@ static HRESULT WINAPI ZoneMgrImpl_GetZoneAttributesEx(IInternetZoneManagerEx2* i
ZONEATTRIBUTES* pZoneAttributes,
DWORD dwFlags)
{
TRACE("(%p)->(%d, %p, 0x%x)\n", iface, dwZone, pZoneAttributes, dwFlags);
TRACE("(%p)->(%ld, %p, 0x%lx)\n", iface, dwZone, pZoneAttributes, dwFlags);
if (dwFlags)
FIXME("dwFlags 0x%x ignored\n", dwFlags);
FIXME("dwFlags 0x%lx ignored\n", dwFlags);
return IInternetZoneManagerEx2_GetZoneAttributes(iface, dwZone, pZoneAttributes);
}
@ -1715,7 +1715,7 @@ static HRESULT WINAPI ZoneMgrImpl_GetZoneSecurityState(IInternetZoneManagerEx2*
LPDWORD pdwState,
BOOL *pfPolicyEncountered)
{
FIXME("(%p)->(%d, %d, %p, %p) stub\n", iface, dwZoneIndex, fRespectPolicy,
FIXME("(%p)->(%ld, %d, %p, %p) stub\n", iface, dwZoneIndex, fRespectPolicy,
pdwState, pfPolicyEncountered);
*pdwState = SECURITY_IE_STATE_GREEN;
@ -1806,7 +1806,7 @@ HRESULT ZoneMgrImpl_Construct(IUnknown *pUnkOuter, LPVOID *ppobj)
HRESULT WINAPI CoInternetCreateSecurityManager( IServiceProvider *pSP,
IInternetSecurityManager **ppSM, DWORD dwReserved )
{
TRACE("%p %p %d\n", pSP, ppSM, dwReserved );
TRACE("%p %p %ld\n", pSP, ppSM, dwReserved );
if(pSP)
FIXME("pSP not supported\n");
@ -1819,7 +1819,7 @@ HRESULT WINAPI CoInternetCreateSecurityManager( IServiceProvider *pSP,
*/
HRESULT WINAPI CoInternetCreateZoneManager(IServiceProvider* pSP, IInternetZoneManager** ppZM, DWORD dwReserved)
{
TRACE("(%p %p %x)\n", pSP, ppZM, dwReserved);
TRACE("(%p %p %lx)\n", pSP, ppZM, dwReserved);
return ZoneMgrImpl_Construct(NULL, (void**)ppZM);
}
@ -1876,7 +1876,7 @@ static HRESULT parse_security_url(const WCHAR *url, PSUACTION action, WCHAR **re
CoTaskMemFree(new_url);
if(hres != S_OK) {
WARN("failed: %08x\n", hres);
WARN("failed: %08lx\n", hres);
CoTaskMemFree(alloc_url);
return hres;
}
@ -1919,7 +1919,7 @@ static HRESULT parse_security_url(const WCHAR *url, PSUACTION action, WCHAR **re
}
if(FAILED(hres)) {
WARN("failed %08x\n", hres);
WARN("failed %08lx\n", hres);
CoTaskMemFree(alloc_url);
return hres;
}
@ -1944,7 +1944,7 @@ HRESULT WINAPI CoInternetGetSecurityUrl(LPCWSTR pwzUrl, LPWSTR *ppwzSecUrl, PSUA
WCHAR *secure_url;
HRESULT hres;
TRACE("(%p,%p,%u,%u)\n", pwzUrl, ppwzSecUrl, psuAction, dwReserved);
TRACE("(%p,%p,%u,%lu)\n", pwzUrl, ppwzSecUrl, psuAction, dwReserved);
hres = parse_security_url(pwzUrl, psuAction, &secure_url);
if(FAILED(hres))
@ -1970,7 +1970,7 @@ HRESULT WINAPI CoInternetGetSecurityUrl(LPCWSTR pwzUrl, LPWSTR *ppwzSecUrl, PSUA
hres = E_OUTOFMEMORY;
CoTaskMemFree(secure_url);
if(hres != S_OK) {
WARN("UrlGetPart failed: %08x\n", hres);
WARN("UrlGetPart failed: %08lx\n", hres);
CoTaskMemFree(new_url);
return FAILED(hres) ? hres : E_FAIL;
}
@ -1993,7 +1993,7 @@ HRESULT WINAPI CoInternetGetSecurityUrlEx(IUri *pUri, IUri **ppSecUri, PSUACTION
WCHAR *ret_url;
HRESULT hres;
TRACE("(%p,%p,%u,%u)\n", pUri, ppSecUri, psuAction, (DWORD)dwReserved);
TRACE("(%p,%p,%u,%lu)\n", pUri, ppSecUri, psuAction, (DWORD)dwReserved);
if(!pUri || !ppSecUri)
return E_INVALIDARG;
@ -2029,7 +2029,7 @@ HRESULT WINAPI CoInternetGetSecurityUrlEx(IUri *pUri, IUri **ppSecUri, PSUACTION
*/
HRESULT WINAPI CompareSecurityIds(BYTE *secid1, DWORD size1, BYTE *secid2, DWORD size2, DWORD reserved)
{
FIXME("(%p %d %p %d %x)\n", secid1, size1, secid2, size2, reserved);
FIXME("(%p %ld %p %ld %lx)\n", secid1, size1, secid2, size2, reserved);
return E_NOTIMPL;
}

36
dlls/urlmon/session.c
View File

@ -91,13 +91,13 @@ static HRESULT get_protocol_cf(LPCWSTR schema, DWORD schema_len, CLSID *pclsid,
res = RegQueryValueExW(hkey, L"CLSID", NULL, &type, (BYTE*)str_clsid, &size);
RegCloseKey(hkey);
if(res != ERROR_SUCCESS || type != REG_SZ) {
WARN("Could not get protocol CLSID res=%d\n", res);
WARN("Could not get protocol CLSID res=%ld\n", res);
return MK_E_SYNTAX;
}
hres = CLSIDFromString(str_clsid, &clsid);
if(FAILED(hres)) {
WARN("CLSIDFromString failed: %08x\n", hres);
WARN("CLSIDFromString failed: %08lx\n", hres);
return hres;
}
@ -264,7 +264,7 @@ IInternetProtocol *get_mime_filter(LPCWSTR mime)
if(cf) {
hres = IClassFactory_CreateInstance(cf, NULL, &IID_IInternetProtocol, (void**)&ret);
if(FAILED(hres)) {
WARN("CreateInstance failed: %08x\n", hres);
WARN("CreateInstance failed: %08lx\n", hres);
return NULL;
}
@ -292,13 +292,13 @@ IInternetProtocol *get_mime_filter(LPCWSTR mime)
hres = CLSIDFromString(clsidw, &clsid);
if(FAILED(hres)) {
WARN("CLSIDFromString failed for %s (%x)\n", debugstr_w(mime), hres);
WARN("CLSIDFromString failed for %s (%lx)\n", debugstr_w(mime), hres);
return NULL;
}
hres = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IInternetProtocol, (void**)&ret);
if(FAILED(hres)) {
WARN("CoCreateInstance failed: %08x\n", hres);
WARN("CoCreateInstance failed: %08lx\n", hres);
return NULL;
}
@ -338,13 +338,13 @@ static HRESULT WINAPI InternetSession_RegisterNameSpace(IInternetSession *iface,
IClassFactory *pCF, REFCLSID rclsid, LPCWSTR pwzProtocol, ULONG cPatterns,
const LPCWSTR *ppwzPatterns, DWORD dwReserved)
{
TRACE("(%p %s %s %d %p %d)\n", pCF, debugstr_guid(rclsid), debugstr_w(pwzProtocol),
TRACE("(%p %s %s %ld %p %ld)\n", pCF, debugstr_guid(rclsid), debugstr_w(pwzProtocol),
cPatterns, ppwzPatterns, dwReserved);
if(cPatterns || ppwzPatterns)
FIXME("patterns not supported\n");
if(dwReserved)
WARN("dwReserved = %d\n", dwReserved);
WARN("dwReserved = %ld\n", dwReserved);
if(!pCF || !pwzProtocol)
return E_INVALIDARG;
@ -419,7 +419,7 @@ static HRESULT WINAPI InternetSession_CreateBinding(IInternetSession *iface,
BindProtocol *protocol;
HRESULT hres;
TRACE("(%p %s %p %p %p %08x)\n", pBC, debugstr_w(szUrl), pUnkOuter, ppUnk,
TRACE("(%p %s %p %p %p %08lx)\n", pBC, debugstr_w(szUrl), pUnkOuter, ppUnk,
ppOInetProt, dwOption);
if(pBC || pUnkOuter || ppUnk || dwOption)
@ -436,7 +436,7 @@ static HRESULT WINAPI InternetSession_CreateBinding(IInternetSession *iface,
static HRESULT WINAPI InternetSession_SetSessionOption(IInternetSession *iface,
DWORD dwOption, LPVOID pBuffer, DWORD dwBufferLength, DWORD dwReserved)
{
FIXME("(%08x %p %d %d)\n", dwOption, pBuffer, dwBufferLength, dwReserved);
FIXME("(%08lx %p %ld %ld)\n", dwOption, pBuffer, dwBufferLength, dwReserved);
return E_NOTIMPL;
}
@ -473,12 +473,12 @@ static IInternetSession InternetSession = { &InternetSessionVtbl };
HRESULT WINAPI CoInternetGetSession(DWORD dwSessionMode, IInternetSession **ppIInternetSession,
DWORD dwReserved)
{
TRACE("(%d %p %d)\n", dwSessionMode, ppIInternetSession, dwReserved);
TRACE("(%ld %p %ld)\n", dwSessionMode, ppIInternetSession, dwReserved);
if(dwSessionMode)
ERR("dwSessionMode=%d\n", dwSessionMode);
ERR("dwSessionMode=%ld\n", dwSessionMode);
if(dwReserved)
ERR("dwReserved=%d\n", dwReserved);
ERR("dwReserved=%ld\n", dwReserved);
IInternetSession_AddRef(&InternetSession);
*ppIInternetSession = &InternetSession;
@ -626,10 +626,10 @@ LPWSTR get_useragent(void)
HRESULT WINAPI UrlMkGetSessionOption(DWORD dwOption, LPVOID pBuffer, DWORD dwBufferLength,
DWORD* pdwBufferLength, DWORD dwReserved)
{
TRACE("(%x, %p, %d, %p)\n", dwOption, pBuffer, dwBufferLength, pdwBufferLength);
TRACE("(%lx, %p, %ld, %p)\n", dwOption, pBuffer, dwBufferLength, pdwBufferLength);
if(dwReserved)
WARN("dwReserved = %d\n", dwReserved);
WARN("dwReserved = %ld\n", dwReserved);
switch(dwOption) {
case URLMON_OPTION_USERAGENT: {
@ -672,7 +672,7 @@ HRESULT WINAPI UrlMkGetSessionOption(DWORD dwOption, LPVOID pBuffer, DWORD dwBuf
return S_OK;
}
default:
FIXME("unsupported option %x\n", dwOption);
FIXME("unsupported option %lx\n", dwOption);
}
return E_INVALIDARG;
@ -684,7 +684,7 @@ HRESULT WINAPI UrlMkGetSessionOption(DWORD dwOption, LPVOID pBuffer, DWORD dwBuf
HRESULT WINAPI UrlMkSetSessionOption(DWORD dwOption, LPVOID pBuffer, DWORD dwBufferLength,
DWORD Reserved)
{
TRACE("(%x %p %x)\n", dwOption, pBuffer, dwBufferLength);
TRACE("(%lx %p %lx)\n", dwOption, pBuffer, dwBufferLength);
switch(dwOption) {
case URLMON_OPTION_USERAGENT: {
@ -716,7 +716,7 @@ HRESULT WINAPI UrlMkSetSessionOption(DWORD dwOption, LPVOID pBuffer, DWORD dwBuf
break;
}
default:
FIXME("Unknown option %x\n", dwOption);
FIXME("Unknown option %lx\n", dwOption);
return E_INVALIDARG;
}
@ -732,7 +732,7 @@ HRESULT WINAPI ObtainUserAgentString(DWORD option, char *ret, DWORD *ret_size)
WCHAR buf[1024];
HRESULT hres = S_OK;
TRACE("(%d %p %p)\n", option, ret, ret_size);
TRACE("(%ld %p %p)\n", option, ret, ret_size);
if(!ret || !ret_size)
return E_INVALIDARG;

22
dlls/urlmon/umon.c
View File

@ -86,7 +86,7 @@ static ULONG WINAPI URLMoniker_AddRef(IMoniker *iface)
URLMoniker *This = impl_from_IMoniker(iface);
ULONG refCount = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%u\n",This, refCount);
TRACE("(%p) ref=%lu\n",This, refCount);
return refCount;
}
@ -96,7 +96,7 @@ static ULONG WINAPI URLMoniker_Release(IMoniker *iface)
URLMoniker *This = impl_from_IMoniker(iface);
ULONG refCount = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%u\n",This, refCount);
TRACE("(%p) ref=%lu\n",This, refCount);
if (!refCount) {
if(This->uri)
@ -285,7 +285,7 @@ static HRESULT WINAPI URLMoniker_Reduce(IMoniker *iface, IBindCtx *pbc,
{
URLMoniker *This = impl_from_IMoniker(iface);
TRACE("(%p,%p,%d,%p,%p)\n", This, pbc, dwReduceHowFar, ppmkToLeft, ppmkReduced);
TRACE("(%p,%p,%ld,%p,%p)\n", This, pbc, dwReduceHowFar, ppmkToLeft, ppmkReduced);
if(!ppmkReduced)
return E_INVALIDARG;
@ -634,7 +634,7 @@ HRESULT WINAPI CreateURLMonikerEx(IMoniker *pmkContext, LPCWSTR szURL, IMoniker
URLMoniker *obj;
HRESULT hres;
TRACE("(%p, %s, %p, %08x)\n", pmkContext, debugstr_w(szURL), ppmk, dwFlags);
TRACE("(%p, %s, %p, %08lx)\n", pmkContext, debugstr_w(szURL), ppmk, dwFlags);
if (ppmk)
*ppmk = NULL;
@ -643,7 +643,7 @@ HRESULT WINAPI CreateURLMonikerEx(IMoniker *pmkContext, LPCWSTR szURL, IMoniker
return E_INVALIDARG;
if(dwFlags >= ARRAY_SIZE(create_flags_map)) {
FIXME("Unsupported flags %x\n", dwFlags);
FIXME("Unsupported flags %lx\n", dwFlags);
return E_INVALIDARG;
}
@ -687,7 +687,7 @@ HRESULT WINAPI CreateURLMonikerEx2(IMoniker *pmkContext, IUri *pUri, IMoniker **
URLMoniker *ret;
HRESULT hres;
TRACE("(%p %p %p %x)\n", pmkContext, pUri, ppmk, dwFlags);
TRACE("(%p %p %p %lx)\n", pmkContext, pUri, ppmk, dwFlags);
if (ppmk)
*ppmk = NULL;
@ -696,7 +696,7 @@ HRESULT WINAPI CreateURLMonikerEx2(IMoniker *pmkContext, IUri *pUri, IMoniker **
return E_INVALIDARG;
if(dwFlags >= ARRAY_SIZE(create_flags_map)) {
FIXME("Unsupported flags %x\n", dwFlags);
FIXME("Unsupported flags %lx\n", dwFlags);
return E_INVALIDARG;
}
@ -788,7 +788,7 @@ HRESULT WINAPI BindAsyncMoniker(IMoniker *pmk, DWORD grfOpt, IBindStatusCallback
LPBC pbc = NULL;
HRESULT hr = E_INVALIDARG;
TRACE("(%p %08x %p %s %p)\n", pmk, grfOpt, pbsc, debugstr_guid(iidResult), ppvResult);
TRACE("(%p %08lx %p %s %p)\n", pmk, grfOpt, pbsc, debugstr_guid(iidResult), ppvResult);
if (pmk && ppvResult)
{
@ -838,7 +838,7 @@ HRESULT WINAPI URLDownloadToCacheFileA(LPUNKNOWN lpUnkCaller, LPCSTR szURL, LPST
int len;
HRESULT hres;
TRACE("(%p %s %p %d %d %p)\n", lpUnkCaller, debugstr_a(szURL), szFileName,
TRACE("(%p %s %p %ld %ld %p)\n", lpUnkCaller, debugstr_a(szURL), szFileName,
dwBufLength, dwReserved, pBSC);
if(szURL) {
@ -875,7 +875,7 @@ HRESULT WINAPI URLDownloadToCacheFileW(LPUNKNOWN lpUnkCaller, LPCWSTR szURL, LPW
static WCHAR header[] = L"HTTP/1.0 200 OK\\r\\n\\r\\n";
TRACE("(%p, %s, %p, %d, %d, %p)\n", lpUnkCaller, debugstr_w(szURL),
TRACE("(%p, %s, %p, %ld, %ld, %p)\n", lpUnkCaller, debugstr_w(szURL),
szFileName, dwBufLength, dwReserved, pBSC);
if (!szURL || !szFileName)
@ -935,7 +935,7 @@ HRESULT WINAPI HlinkSimpleNavigateToString( LPCWSTR szTarget,
LPCWSTR szLocation, LPCWSTR szTargetFrameName, IUnknown *pUnk,
IBindCtx *pbc, IBindStatusCallback *pbsc, DWORD grfHLNF, DWORD dwReserved)
{
FIXME("%s %s %s %p %p %p %u %u partial stub\n", debugstr_w( szTarget ), debugstr_w( szLocation ),
FIXME("%s %s %s %p %p %p %lu %lu partial stub\n", debugstr_w( szTarget ), debugstr_w( szLocation ),
debugstr_w( szTargetFrameName ), pUnk, pbc, pbsc, grfHLNF, dwReserved);
/* undocumented: 0 means HLNF_OPENINNEWWINDOW*/

10
dlls/urlmon/umstream.c
View File

@ -263,7 +263,7 @@ HRESULT WINAPI URLOpenBlockingStreamA(LPUNKNOWN pCaller, LPCSTR szURL,
int len;
HRESULT hr;
TRACE("(%p, %s, %p, 0x%x, %p)\n", pCaller, szURL, ppStream, dwReserved, lpfnCB);
TRACE("(%p, %s, %p, 0x%lx, %p)\n", pCaller, szURL, ppStream, dwReserved, lpfnCB);
if (!szURL || !ppStream)
return E_INVALIDARG;
@ -293,7 +293,7 @@ HRESULT WINAPI URLOpenBlockingStreamW(LPUNKNOWN pCaller, LPCWSTR szURL,
{
ProxyBindStatusCallback blocking_bsc;
TRACE("(%p, %s, %p, 0x%x, %p)\n", pCaller, debugstr_w(szURL), ppStream,
TRACE("(%p, %s, %p, 0x%lx, %p)\n", pCaller, debugstr_w(szURL), ppStream,
dwReserved, lpfnCB);
if (!szURL || !ppStream)
@ -315,7 +315,7 @@ HRESULT WINAPI URLOpenStreamA(LPUNKNOWN pCaller, LPCSTR szURL, DWORD dwReserved,
int len;
HRESULT hr;
TRACE("(%p, %s, 0x%x, %p)\n", pCaller, szURL, dwReserved, lpfnCB);
TRACE("(%p, %s, 0x%lx, %p)\n", pCaller, szURL, dwReserved, lpfnCB);
if (!szURL)
return E_INVALIDARG;
@ -343,7 +343,7 @@ HRESULT WINAPI URLOpenStreamW(LPUNKNOWN pCaller, LPCWSTR szURL, DWORD dwReserved
ProxyBindStatusCallback async_bsc;
IStream *pStream;
TRACE("(%p, %s, 0x%x, %p)\n", pCaller, debugstr_w(szURL), dwReserved,
TRACE("(%p, %s, 0x%lx, %p)\n", pCaller, debugstr_w(szURL), dwReserved,
lpfnCB);
if (!szURL)
@ -365,6 +365,6 @@ HRESULT WINAPI URLOpenStreamW(LPUNKNOWN pCaller, LPCWSTR szURL, DWORD dwReserved
HRESULT WINAPI URLOpenPullStreamW(IUnknown *caller, const WCHAR *url, DWORD reserved,
IBindStatusCallback *callback)
{
FIXME("%p %s %u %p, stub!\n", caller, debugstr_w(url), reserved, callback);
FIXME("%p %s %lu %p, stub!\n", caller, debugstr_w(url), reserved, callback);
return E_NOTIMPL;
}

226
dlls/urlmon/uri.c
View File

@ -634,7 +634,7 @@ static DWORD remove_dot_segments(WCHAR *path, DWORD path_len) {
}
len = out - path;
TRACE("(%p %d): Path after dot segments removed %s len=%d\n", path, path_len,
TRACE("(%p %ld): Path after dot segments removed %s len=%ld\n", path, path_len,
debugstr_wn(path, len), len);
return len;
}
@ -974,12 +974,12 @@ static BOOL parse_scheme(const WCHAR **ptr, parse_data *data, DWORD flags, DWORD
data->scheme_len = lstrlenW(L"file");
data->has_implicit_scheme = TRUE;
TRACE("(%p %p %x): URI is an implicit file path.\n", ptr, data, flags);
TRACE("(%p %p %lx): URI is an implicit file path.\n", ptr, data, flags);
} else {
/* Windows does not consider anything that can implicitly be a file
* path to be a valid URI if the ALLOW_IMPLICIT_FILE_SCHEME flag is not set...
*/
TRACE("(%p %p %x): URI is implicitly a file path, but, the ALLOW_IMPLICIT_FILE_SCHEME flag wasn't set.\n",
TRACE("(%p %p %lx): URI is implicitly a file path, but, the ALLOW_IMPLICIT_FILE_SCHEME flag wasn't set.\n",
ptr, data, flags);
return FALSE;
}
@ -994,24 +994,24 @@ static BOOL parse_scheme(const WCHAR **ptr, parse_data *data, DWORD flags, DWORD
data->scheme_len = lstrlenW(L"*");
data->has_implicit_scheme = TRUE;
TRACE("(%p %p %x): URI is an implicit wildcard scheme.\n", ptr, data, flags);
TRACE("(%p %p %lx): URI is an implicit wildcard scheme.\n", ptr, data, flags);
} else if (flags & Uri_CREATE_ALLOW_RELATIVE) {
data->is_relative = TRUE;
TRACE("(%p %p %x): URI is relative.\n", ptr, data, flags);
TRACE("(%p %p %lx): URI is relative.\n", ptr, data, flags);
} else {
TRACE("(%p %p %x): Malformed URI found. Unable to deduce scheme name.\n", ptr, data, flags);
TRACE("(%p %p %lx): Malformed URI found. Unable to deduce scheme name.\n", ptr, data, flags);
return FALSE;
}
}
if(!data->is_relative)
TRACE("(%p %p %x): Found scheme=%s scheme_len=%d\n", ptr, data, flags,
TRACE("(%p %p %lx): Found scheme=%s scheme_len=%ld\n", ptr, data, flags,
debugstr_wn(data->scheme, data->scheme_len), data->scheme_len);
if(!parse_scheme_type(data))
return FALSE;
TRACE("(%p %p %x): Assigned %d as the URL_SCHEME.\n", ptr, data, flags, data->scheme_type);
TRACE("(%p %p %lx): Assigned %d as the URL_SCHEME.\n", ptr, data, flags, data->scheme_type);
return TRUE;
}
@ -1094,7 +1094,7 @@ static void parse_userinfo(const WCHAR **ptr, parse_data *data, DWORD flags) {
const WCHAR *start = *ptr;
if(!parse_username(ptr, data, flags, 0)) {
TRACE("(%p %p %x): URI contained no userinfo.\n", ptr, data, flags);
TRACE("(%p %p %lx): URI contained no userinfo.\n", ptr, data, flags);
return;
}
@ -1104,7 +1104,7 @@ static void parse_userinfo(const WCHAR **ptr, parse_data *data, DWORD flags) {
*ptr = start;
data->username = NULL;
data->username_len = 0;
TRACE("(%p %p %x): URI contained no userinfo.\n", ptr, data, flags);
TRACE("(%p %p %lx): URI contained no userinfo.\n", ptr, data, flags);
return;
}
}
@ -1116,16 +1116,16 @@ static void parse_userinfo(const WCHAR **ptr, parse_data *data, DWORD flags) {
data->password = NULL;
data->password_len = 0;
TRACE("(%p %p %x): URI contained no userinfo.\n", ptr, data, flags);
TRACE("(%p %p %lx): URI contained no userinfo.\n", ptr, data, flags);
return;
}
if(data->username)
TRACE("(%p %p %x): Found username %s len=%d.\n", ptr, data, flags,
TRACE("(%p %p %lx): Found username %s len=%ld.\n", ptr, data, flags,
debugstr_wn(data->username, data->username_len), data->username_len);
if(data->password)
TRACE("(%p %p %x): Found password %s len=%d.\n", ptr, data, flags,
TRACE("(%p %p %lx): Found password %s len=%ld.\n", ptr, data, flags,
debugstr_wn(data->password, data->password_len), data->password_len);
++(*ptr);
@ -1165,7 +1165,7 @@ static BOOL parse_port(const WCHAR **ptr, parse_data *data) {
data->port_value = port;
data->port_len = *ptr - data->port;
TRACE("(%p %p): Found port %s len=%d value=%u\n", ptr, data,
TRACE("(%p %p): Found port %s len=%ld value=%lu\n", ptr, data,
debugstr_wn(data->port, data->port_len), data->port_len, data->port_value);
return TRUE;
}
@ -1219,7 +1219,7 @@ static BOOL parse_ipv4address(const WCHAR **ptr, parse_data *data) {
return FALSE;
}
TRACE("(%p %p): IPv4 address found. host=%s host_len=%d host_type=%d\n",
TRACE("(%p %p): IPv4 address found. host=%s host_len=%ld host_type=%d\n",
ptr, data, debugstr_wn(data->host, data->host_len),
data->host_len, data->host_type);
return TRUE;
@ -1290,7 +1290,7 @@ static BOOL parse_reg_name(const WCHAR **ptr, parse_data *data, DWORD extras) {
if(data->scheme_type != URL_SCHEME_UNKNOWN) {
*ptr = data->host;
data->host = NULL;
TRACE("(%p %p %x): Expected valid port\n", ptr, data, extras);
TRACE("(%p %p %lx): Expected valid port\n", ptr, data, extras);
return FALSE;
} else
/* Windows gives up on trying to parse a port when it
@ -1325,7 +1325,7 @@ static BOOL parse_reg_name(const WCHAR **ptr, parse_data *data, DWORD extras) {
if(has_start_bracket) {
/* Make sure the last character of the host wasn't a ']'. */
if(*(*ptr-1) == ']') {
TRACE("(%p %p %x): Expected an IP literal inside of the host\n", ptr, data, extras);
TRACE("(%p %p %lx): Expected an IP literal inside of the host\n", ptr, data, extras);
*ptr = data->host;
data->host = NULL;
return FALSE;
@ -1342,7 +1342,7 @@ static BOOL parse_reg_name(const WCHAR **ptr, parse_data *data, DWORD extras) {
else
data->host_type = Uri_HOST_DNS;
TRACE("(%p %p %x): Parsed reg-name. host=%s len=%d\n", ptr, data, extras,
TRACE("(%p %p %lx): Parsed reg-name. host=%s len=%ld\n", ptr, data, extras,
debugstr_wn(data->host, data->host_len), data->host_len);
return TRUE;
}
@ -1476,7 +1476,7 @@ static BOOL parse_host(const WCHAR **ptr, parse_data *data, DWORD extras) {
if(!parse_ip_literal(ptr, data, extras)) {
if(!parse_ipv4address(ptr, data)) {
if(!parse_reg_name(ptr, data, extras)) {
TRACE("(%p %p %x): Malformed URI, Unknown host type.\n", ptr, data, extras);
TRACE("(%p %p %lx): Malformed URI, Unknown host type.\n", ptr, data, extras);
return FALSE;
}
}
@ -1560,10 +1560,10 @@ static BOOL parse_path_hierarchical(const WCHAR **ptr, parse_data *data, DWORD f
}
if(data->path)
TRACE("(%p %p %x): Parsed path %s len=%d\n", ptr, data, flags,
TRACE("(%p %p %lx): Parsed path %s len=%ld\n", ptr, data, flags,
debugstr_wn(data->path, data->path_len), data->path_len);
else
TRACE("(%p %p %x): The URI contained no path\n", ptr, data, flags);
TRACE("(%p %p %lx): The URI contained no path\n", ptr, data, flags);
return TRUE;
}
@ -1610,7 +1610,7 @@ static BOOL parse_path_opaque(const WCHAR **ptr, parse_data *data, DWORD flags)
}
if (data->path) data->path_len = *ptr - data->path;
TRACE("(%p %p %x): Parsed opaque URI path %s len=%d\n", ptr, data, flags,
TRACE("(%p %p %lx): Parsed opaque URI path %s len=%ld\n", ptr, data, flags,
debugstr_wn(data->path, data->path_len), data->path_len);
return TRUE;
}
@ -1659,7 +1659,7 @@ static BOOL parse_hierpart(const WCHAR **ptr, parse_data *data, DWORD flags) {
*/
if(data->scheme_type != URL_SCHEME_UNKNOWN ||
!(flags & Uri_CREATE_NO_CRACK_UNKNOWN_SCHEMES)) {
TRACE("(%p %p %x): Treating URI as an hierarchical URI.\n", ptr, data, flags);
TRACE("(%p %p %lx): Treating URI as an hierarchical URI.\n", ptr, data, flags);
data->is_opaque = FALSE;
if(data->scheme_type == URL_SCHEME_WILDCARD && !data->has_implicit_scheme) {
@ -1685,7 +1685,7 @@ static BOOL parse_hierpart(const WCHAR **ptr, parse_data *data, DWORD flags) {
* URI.
*/
TRACE("(%p %p %x): Treating URI as an opaque URI.\n", ptr, data, flags);
TRACE("(%p %p %lx): Treating URI as an opaque URI.\n", ptr, data, flags);
data->is_opaque = TRUE;
if(!parse_path_opaque(ptr, data, flags))
@ -1705,7 +1705,7 @@ static BOOL parse_query(const WCHAR **ptr, parse_data *data, DWORD flags) {
const BOOL known_scheme = data->scheme_type != URL_SCHEME_UNKNOWN;
if(**ptr != '?') {
TRACE("(%p %p %x): URI didn't contain a query string.\n", ptr, data, flags);
TRACE("(%p %p %lx): URI didn't contain a query string.\n", ptr, data, flags);
return TRUE;
}
@ -1728,7 +1728,7 @@ static BOOL parse_query(const WCHAR **ptr, parse_data *data, DWORD flags) {
data->query_len = *ptr - data->query;
TRACE("(%p %p %x): Parsed query string %s len=%d\n", ptr, data, flags,
TRACE("(%p %p %lx): Parsed query string %s len=%ld\n", ptr, data, flags,
debugstr_wn(data->query, data->query_len), data->query_len);
return TRUE;
}
@ -1744,7 +1744,7 @@ static BOOL parse_fragment(const WCHAR **ptr, parse_data *data, DWORD flags) {
const BOOL known_scheme = data->scheme_type != URL_SCHEME_UNKNOWN;
if(**ptr != '#') {
TRACE("(%p %p %x): URI didn't contain a fragment.\n", ptr, data, flags);
TRACE("(%p %p %lx): URI didn't contain a fragment.\n", ptr, data, flags);
return TRUE;
}
@ -1767,7 +1767,7 @@ static BOOL parse_fragment(const WCHAR **ptr, parse_data *data, DWORD flags) {
data->fragment_len = *ptr - data->fragment;
TRACE("(%p %p %x): Parsed fragment %s len=%d\n", ptr, data, flags,
TRACE("(%p %p %lx): Parsed fragment %s len=%ld\n", ptr, data, flags,
debugstr_wn(data->fragment, data->fragment_len), data->fragment_len);
return TRUE;
}
@ -1784,7 +1784,7 @@ static BOOL parse_uri(parse_data *data, DWORD flags) {
ptr = data->uri;
pptr = &ptr;
TRACE("(%p %x): BEGINNING TO PARSE URI %s.\n", data, flags, debugstr_w(data->uri));
TRACE("(%p %lx): BEGINNING TO PARSE URI %s.\n", data, flags, debugstr_w(data->uri));
if(!parse_scheme(pptr, data, flags, 0))
return FALSE;
@ -1798,7 +1798,7 @@ static BOOL parse_uri(parse_data *data, DWORD flags) {
if(!parse_fragment(pptr, data, flags))
return FALSE;
TRACE("(%p %x): FINISHED PARSING URI.\n", data, flags);
TRACE("(%p %lx): FINISHED PARSING URI.\n", data, flags);
return TRUE;
}
@ -1932,7 +1932,7 @@ static BOOL canonicalize_userinfo(const parse_data *data, Uri *uri, DWORD flags,
uri->userinfo_len = uri->canon_len - uri->userinfo_start;
if(!computeOnly)
TRACE("(%p %p %x %d): Canonicalized userinfo, userinfo_start=%d, userinfo=%s, userinfo_split=%d userinfo_len=%d.\n",
TRACE("(%p %p %lx %d): Canonicalized userinfo, userinfo_start=%d, userinfo=%s, userinfo_split=%d userinfo_len=%ld.\n",
data, uri, flags, computeOnly, uri->userinfo_start, debugstr_wn(uri->canon_uri + uri->userinfo_start, uri->userinfo_len),
uri->userinfo_split, uri->userinfo_len);
@ -2047,7 +2047,7 @@ static BOOL canonicalize_reg_name(const parse_data *data, Uri *uri,
uri->host_len = uri->canon_len - uri->host_start;
if(!computeOnly)
TRACE("(%p %p %x %d): Canonicalize reg_name=%s len=%d\n", data, uri, flags,
TRACE("(%p %p %lx %d): Canonicalize reg_name=%s len=%ld\n", data, uri, flags,
computeOnly, debugstr_wn(uri->canon_uri+uri->host_start, uri->host_len),
uri->host_len);
@ -2082,7 +2082,7 @@ static BOOL canonicalize_implicit_ipv4address(const parse_data *data, Uri *uri,
uri->host_type = Uri_HOST_IPV4;
if(!computeOnly)
TRACE("%p %p %x %d): Canonicalized implicit IP address=%s len=%d\n",
TRACE("%p %p %lx %d): Canonicalized implicit IP address=%s len=%ld\n",
data, uri, flags, computeOnly,
debugstr_wn(uri->canon_uri+uri->host_start, uri->host_len),
uri->host_len);
@ -2173,7 +2173,7 @@ static BOOL canonicalize_ipv4address(const parse_data *data, Uri *uri, DWORD fla
uri->host_len = uri->canon_len - uri->host_start;
if(!computeOnly)
TRACE("(%p %p %x %d): Canonicalized IPv4 address, ip=%s len=%d\n",
TRACE("(%p %p %lx %d): Canonicalized IPv4 address, ip=%s len=%ld\n",
data, uri, flags, computeOnly,
debugstr_wn(uri->canon_uri+uri->host_start, uri->host_len),
uri->host_len);
@ -2243,7 +2243,7 @@ static BOOL canonicalize_ipv6address(const parse_data *data, Uri *uri,
uri->host_len = uri->canon_len - uri->host_start;
if(!computeOnly)
TRACE("(%p %p %x %d): Canonicalized IPv6 address %s, len=%d\n", data, uri, flags,
TRACE("(%p %p %lx %d): Canonicalized IPv6 address %s, len=%ld\n", data, uri, flags,
computeOnly, debugstr_wn(uri->canon_uri+uri->host_start, uri->host_len),
uri->host_len);
@ -2290,7 +2290,7 @@ static BOOL canonicalize_host(const parse_data *data, Uri *uri, DWORD flags, BOO
uri->host_type = Uri_HOST_UNKNOWN;
break;
default:
FIXME("(%p %p %x %d): Canonicalization for host type %d not supported.\n", data,
FIXME("(%p %p %lx %d): Canonicalization for host type %d not supported.\n", data,
uri, flags, computeOnly, data->host_type);
return FALSE;
}
@ -2544,7 +2544,7 @@ static DWORD canonicalize_path_hierarchical(const WCHAR *path, DWORD path_len, U
}
if(ret_path)
TRACE("Canonicalized path %s len=%d\n", debugstr_wn(ret_path, len), len);
TRACE("Canonicalized path %s len=%ld\n", debugstr_wn(ret_path, len), len);
return len;
}
@ -2663,7 +2663,7 @@ static BOOL canonicalize_path_opaque(const parse_data *data, Uri *uri, DWORD fla
uri->path_len = uri->canon_len - uri->path_start;
if(!computeOnly)
TRACE("(%p %p %x %d): Canonicalized opaque URI path %s len=%d\n", data, uri, flags, computeOnly,
TRACE("(%p %p %lx %d): Canonicalized opaque URI path %s len=%ld\n", data, uri, flags, computeOnly,
debugstr_wn(uri->canon_uri+uri->path_start, uri->path_len), uri->path_len);
return TRUE;
}
@ -2809,7 +2809,7 @@ static BOOL canonicalize_query(const parse_data *data, Uri *uri, DWORD flags, BO
uri->query_len = uri->canon_len - uri->query_start;
if(!computeOnly)
TRACE("(%p %p %x %d): Canonicalized query string %s len=%d\n", data, uri, flags,
TRACE("(%p %p %lx %d): Canonicalized query string %s len=%ld\n", data, uri, flags,
computeOnly, debugstr_wn(uri->canon_uri+uri->query_start, uri->query_len),
uri->query_len);
return TRUE;
@ -2859,7 +2859,7 @@ static BOOL canonicalize_fragment(const parse_data *data, Uri *uri, DWORD flags,
uri->fragment_len = uri->canon_len - uri->fragment_start;
if(!computeOnly)
TRACE("(%p %p %x %d): Canonicalized fragment %s len=%d\n", data, uri, flags,
TRACE("(%p %p %lx %d): Canonicalized fragment %s len=%ld\n", data, uri, flags,
computeOnly, debugstr_wn(uri->canon_uri+uri->fragment_start, uri->fragment_len),
uri->fragment_len);
return TRUE;
@ -2875,7 +2875,7 @@ static BOOL canonicalize_scheme(const parse_data *data, Uri *uri, DWORD flags, B
* URI.
*/
if(!data->is_relative) {
FIXME("(%p %p %x): Unable to determine the scheme type of %s.\n", data,
FIXME("(%p %p %lx): Unable to determine the scheme type of %s.\n", data,
uri, flags, debugstr_w(data->uri));
return FALSE;
}
@ -2892,7 +2892,7 @@ static BOOL canonicalize_scheme(const parse_data *data, Uri *uri, DWORD flags, B
uri->canon_uri[i + pos] = ':';
uri->scheme_start = pos;
TRACE("(%p %p %x): Canonicalized scheme=%s, len=%d.\n", data, uri, flags,
TRACE("(%p %p %lx): Canonicalized scheme=%s, len=%ld.\n", data, uri, flags,
debugstr_wn(uri->canon_uri+uri->scheme_start, data->scheme_len), data->scheme_len);
}
@ -2914,30 +2914,30 @@ static int compute_canonicalized_length(const parse_data *data, DWORD flags) {
memset(&uri, 0, sizeof(Uri));
TRACE("(%p %x): Beginning to compute canonicalized length for URI %s\n", data, flags,
TRACE("(%p %lx): Beginning to compute canonicalized length for URI %s\n", data, flags,
debugstr_w(data->uri));
if(!canonicalize_scheme(data, &uri, flags, TRUE)) {
ERR("(%p %x): Failed to compute URI scheme length.\n", data, flags);
ERR("(%p %lx): Failed to compute URI scheme length.\n", data, flags);
return -1;
}
if(!canonicalize_hierpart(data, &uri, flags, TRUE)) {
ERR("(%p %x): Failed to compute URI hierpart length.\n", data, flags);
ERR("(%p %lx): Failed to compute URI hierpart length.\n", data, flags);
return -1;
}
if(!canonicalize_query(data, &uri, flags, TRUE)) {
ERR("(%p %x): Failed to compute query string length.\n", data, flags);
ERR("(%p %lx): Failed to compute query string length.\n", data, flags);
return -1;
}
if(!canonicalize_fragment(data, &uri, flags, TRUE)) {
ERR("(%p %x): Failed to compute fragment length.\n", data, flags);
ERR("(%p %lx): Failed to compute fragment length.\n", data, flags);
return -1;
}
TRACE("(%p %x): Finished computing canonicalized URI length. length=%d\n", data, flags, uri.canon_len);
TRACE("(%p %lx): Finished computing canonicalized URI length. length=%ld\n", data, flags, uri.canon_len);
return uri.canon_len;
}
@ -2956,12 +2956,12 @@ static HRESULT canonicalize_uri(const parse_data *data, Uri *uri, DWORD flags) {
uri->canon_uri = NULL;
uri->canon_size = uri->canon_len = 0;
TRACE("(%p %p %x): beginning to canonicalize URI %s.\n", data, uri, flags, debugstr_w(data->uri));
TRACE("(%p %p %lx): beginning to canonicalize URI %s.\n", data, uri, flags, debugstr_w(data->uri));
/* First try to compute the length of the URI. */
len = compute_canonicalized_length(data, flags);
if(len == -1) {
ERR("(%p %p %x): Could not compute the canonicalized length of %s.\n", data, uri, flags,
ERR("(%p %p %lx): Could not compute the canonicalized length of %s.\n", data, uri, flags,
debugstr_w(data->uri));
return E_INVALIDARG;
}
@ -2972,24 +2972,24 @@ static HRESULT canonicalize_uri(const parse_data *data, Uri *uri, DWORD flags) {
uri->canon_size = len;
if(!canonicalize_scheme(data, uri, flags, FALSE)) {
ERR("(%p %p %x): Unable to canonicalize the scheme of the URI.\n", data, uri, flags);
ERR("(%p %p %lx): Unable to canonicalize the scheme of the URI.\n", data, uri, flags);
return E_INVALIDARG;
}
uri->scheme_type = data->scheme_type;
if(!canonicalize_hierpart(data, uri, flags, FALSE)) {
ERR("(%p %p %x): Unable to canonicalize the hierpart of the URI\n", data, uri, flags);
ERR("(%p %p %lx): Unable to canonicalize the hierpart of the URI\n", data, uri, flags);
return E_INVALIDARG;
}
if(!canonicalize_query(data, uri, flags, FALSE)) {
ERR("(%p %p %x): Unable to canonicalize query string of the URI.\n",
ERR("(%p %p %lx): Unable to canonicalize query string of the URI.\n",
data, uri, flags);
return E_INVALIDARG;
}
if(!canonicalize_fragment(data, uri, flags, FALSE)) {
ERR("(%p %p %x): Unable to canonicalize fragment of the URI.\n",
ERR("(%p %p %lx): Unable to canonicalize fragment of the URI.\n",
data, uri, flags);
return E_INVALIDARG;
}
@ -3010,7 +3010,7 @@ static HRESULT canonicalize_uri(const parse_data *data, Uri *uri, DWORD flags) {
}
uri->canon_uri[uri->canon_len] = '\0';
TRACE("(%p %p %x): finished canonicalizing the URI. uri=%s\n", data, uri, flags, debugstr_w(uri->canon_uri));
TRACE("(%p %p %lx): finished canonicalizing the URI. uri=%s\n", data, uri, flags, debugstr_w(uri->canon_uri));
return S_OK;
}
@ -3147,10 +3147,10 @@ static HRESULT validate_scheme_name(const UriBuilder *builder, parse_data *data,
if(parse_scheme(pptr, data, flags, ALLOW_NULL_TERM_SCHEME) &&
data->scheme_len == expected_len) {
if(data->scheme)
TRACE("(%p %p %x): Found valid scheme component %s len=%d.\n", builder, data, flags,
TRACE("(%p %p %lx): Found valid scheme component %s len=%ld.\n", builder, data, flags,
debugstr_wn(data->scheme, data->scheme_len), data->scheme_len);
} else {
TRACE("(%p %p %x): Invalid scheme component found %s.\n", builder, data, flags,
TRACE("(%p %p %lx): Invalid scheme component found %s.\n", builder, data, flags,
debugstr_wn(component, expected_len));
return INET_E_INVALID_URL;
}
@ -3183,10 +3183,10 @@ static HRESULT validate_username(const UriBuilder *builder, parse_data *data, DW
pptr = &ptr;
if(parse_username(pptr, data, flags, ALLOW_NULL_TERM_USER_NAME) &&
data->username_len == expected_len)
TRACE("(%p %p %x): Found valid username component %s len=%d.\n", builder, data, flags,
TRACE("(%p %p %lx): Found valid username component %s len=%ld.\n", builder, data, flags,
debugstr_wn(data->username, data->username_len), data->username_len);
else {
TRACE("(%p %p %x): Invalid username component found %s.\n", builder, data, flags,
TRACE("(%p %p %lx): Invalid username component found %s.\n", builder, data, flags,
debugstr_wn(component, expected_len));
return INET_E_INVALID_URL;
}
@ -3218,10 +3218,10 @@ static HRESULT validate_password(const UriBuilder *builder, parse_data *data, DW
pptr = &ptr;
if(parse_password(pptr, data, flags, ALLOW_NULL_TERM_PASSWORD) &&
data->password_len == expected_len)
TRACE("(%p %p %x): Found valid password component %s len=%d.\n", builder, data, flags,
TRACE("(%p %p %lx): Found valid password component %s len=%ld.\n", builder, data, flags,
debugstr_wn(data->password, data->password_len), data->password_len);
else {
TRACE("(%p %p %x): Invalid password component found %s.\n", builder, data, flags,
TRACE("(%p %p %lx): Invalid password component found %s.\n", builder, data, flags,
debugstr_wn(component, expected_len));
return INET_E_INVALID_URL;
}
@ -3264,7 +3264,7 @@ static HRESULT validate_host(const UriBuilder *builder, parse_data *data) {
pptr = &ptr;
if(parse_host(pptr, data, extras) && data->host_len == expected_len)
TRACE("(%p %p): Found valid host name %s len=%d type=%d.\n", builder, data,
TRACE("(%p %p): Found valid host name %s len=%ld type=%d.\n", builder, data,
debugstr_wn(data->host, data->host_len), data->host_len, data->host_type);
else {
TRACE("(%p %p): Invalid host name found %s.\n", builder, data,
@ -3288,7 +3288,7 @@ static void setup_port(const UriBuilder *builder, parse_data *data, DWORD flags)
}
if(data->has_port)
TRACE("(%p %p %x): Using %u as port for IUri.\n", builder, data, flags, data->port_value);
TRACE("(%p %p %lx): Using %lu as port for IUri.\n", builder, data, flags, data->port_value);
}
static HRESULT validate_path(const UriBuilder *builder, parse_data *data, DWORD flags) {
@ -3322,12 +3322,12 @@ static HRESULT validate_path(const UriBuilder *builder, parse_data *data, DWORD
parse_path_opaque(pptr, data, flags) : parse_path_hierarchical(pptr, data, flags);
if(!valid || (check_len && expected_len != data->path_len)) {
TRACE("(%p %p %x): Invalid path component %s.\n", builder, data, flags,
TRACE("(%p %p %lx): Invalid path component %s.\n", builder, data, flags,
debugstr_wn(component, expected_len) );
return INET_E_INVALID_URL;
}
TRACE("(%p %p %x): Valid path component %s len=%d.\n", builder, data, flags,
TRACE("(%p %p %lx): Valid path component %s len=%ld.\n", builder, data, flags,
debugstr_wn(data->path, data->path_len), data->path_len);
return S_OK;
@ -3352,10 +3352,10 @@ static HRESULT validate_query(const UriBuilder *builder, parse_data *data, DWORD
pptr = &ptr;
if(parse_query(pptr, data, flags) && expected_len == data->query_len)
TRACE("(%p %p %x): Valid query component %s len=%d.\n", builder, data, flags,
TRACE("(%p %p %lx): Valid query component %s len=%ld.\n", builder, data, flags,
debugstr_wn(data->query, data->query_len), data->query_len);
else {
TRACE("(%p %p %x): Invalid query component %s.\n", builder, data, flags,
TRACE("(%p %p %lx): Invalid query component %s.\n", builder, data, flags,
debugstr_wn(component, expected_len));
return INET_E_INVALID_URL;
}
@ -3383,10 +3383,10 @@ static HRESULT validate_fragment(const UriBuilder *builder, parse_data *data, DW
pptr = &ptr;
if(parse_fragment(pptr, data, flags) && expected_len == data->fragment_len)
TRACE("(%p %p %x): Valid fragment component %s len=%d.\n", builder, data, flags,
TRACE("(%p %p %lx): Valid fragment component %s len=%ld.\n", builder, data, flags,
debugstr_wn(data->fragment, data->fragment_len), data->fragment_len);
else {
TRACE("(%p %p %x): Invalid fragment component %s.\n", builder, data, flags,
TRACE("(%p %p %lx): Invalid fragment component %s.\n", builder, data, flags,
debugstr_wn(component, expected_len));
return INET_E_INVALID_URL;
}
@ -3400,7 +3400,7 @@ static HRESULT validate_components(const UriBuilder *builder, parse_data *data,
memset(data, 0, sizeof(parse_data));
TRACE("(%p %p %x): Beginning to validate builder components.\n", builder, data, flags);
TRACE("(%p %p %lx): Beginning to validate builder components.\n", builder, data, flags);
hr = validate_scheme_name(builder, data, flags);
if(FAILED(hr))
@ -3410,7 +3410,7 @@ static HRESULT validate_components(const UriBuilder *builder, parse_data *data,
if(data->scheme_type == URL_SCHEME_FILE) {
if((builder->password || (builder->uri && builder->uri->userinfo_split > -1)) ||
(builder->username || (builder->uri && builder->uri->userinfo_start > -1))) {
TRACE("(%p %p %x): File schemes can't contain a username or password.\n",
TRACE("(%p %p %lx): File schemes can't contain a username or password.\n",
builder, data, flags);
return INET_E_INVALID_URL;
}
@ -3445,7 +3445,7 @@ static HRESULT validate_components(const UriBuilder *builder, parse_data *data,
if(FAILED(hr))
return hr;
TRACE("(%p %p %x): Finished validating builder components.\n", builder, data, flags);
TRACE("(%p %p %lx): Finished validating builder components.\n", builder, data, flags);
return S_OK;
}
@ -3754,9 +3754,9 @@ static DWORD generate_raw_uri(const parse_data *data, BSTR uri, DWORD flags) {
}
if(uri)
TRACE("(%p %p): Generated raw uri=%s len=%d\n", data, uri, debugstr_wn(uri, length), length);
TRACE("(%p %p): Generated raw uri=%s len=%ld\n", data, uri, debugstr_wn(uri, length), length);
else
TRACE("(%p %p): Computed raw uri len=%d\n", data, uri, length);
TRACE("(%p %p): Computed raw uri len=%ld\n", data, uri, length);
return length;
}
@ -3831,7 +3831,7 @@ static ULONG WINAPI Uri_AddRef(IUri *iface)
Uri *This = impl_from_IUri(iface);
LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref);
TRACE("(%p) ref=%ld\n", This, ref);
return ref;
}
@ -3841,7 +3841,7 @@ static ULONG WINAPI Uri_Release(IUri *iface)
Uri *This = impl_from_IUri(iface);
LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref);
TRACE("(%p) ref=%ld\n", This, ref);
if(!ref)
destroy_uri_obj(This);
@ -3853,7 +3853,7 @@ static HRESULT WINAPI Uri_GetPropertyBSTR(IUri *iface, Uri_PROPERTY uriProp, BST
{
Uri *This = impl_from_IUri(iface);
HRESULT hres;
TRACE("(%p %s)->(%d %p %x)\n", This, debugstr_w(This->canon_uri), uriProp, pbstrProperty, dwFlags);
TRACE("(%p %s)->(%d %p %lx)\n", This, debugstr_w(This->canon_uri), uriProp, pbstrProperty, dwFlags);
if(!This->create_flags)
return E_UNEXPECTED;
@ -3875,7 +3875,7 @@ static HRESULT WINAPI Uri_GetPropertyBSTR(IUri *iface, Uri_PROPERTY uriProp, BST
/* Don't have support for flags yet. */
if(dwFlags) {
FIXME("(%p)->(%d %p %x)\n", This, uriProp, pbstrProperty, dwFlags);
FIXME("(%p)->(%d %p %lx)\n", This, uriProp, pbstrProperty, dwFlags);
return E_NOTIMPL;
}
@ -4134,7 +4134,7 @@ static HRESULT WINAPI Uri_GetPropertyBSTR(IUri *iface, Uri_PROPERTY uriProp, BST
break;
default:
FIXME("(%p)->(%d %p %x)\n", This, uriProp, pbstrProperty, dwFlags);
FIXME("(%p)->(%d %p %lx)\n", This, uriProp, pbstrProperty, dwFlags);
hres = E_NOTIMPL;
}
@ -4145,7 +4145,7 @@ static HRESULT WINAPI Uri_GetPropertyLength(IUri *iface, Uri_PROPERTY uriProp, D
{
Uri *This = impl_from_IUri(iface);
HRESULT hres;
TRACE("(%p %s)->(%d %p %x)\n", This, debugstr_w(This->canon_uri), uriProp, pcchProperty, dwFlags);
TRACE("(%p %s)->(%d %p %lx)\n", This, debugstr_w(This->canon_uri), uriProp, pcchProperty, dwFlags);
if(!This->create_flags)
return E_UNEXPECTED;
@ -4158,7 +4158,7 @@ static HRESULT WINAPI Uri_GetPropertyLength(IUri *iface, Uri_PROPERTY uriProp, D
/* Don't have support for flags yet. */
if(dwFlags) {
FIXME("(%p)->(%d %p %x)\n", This, uriProp, pcchProperty, dwFlags);
FIXME("(%p)->(%d %p %lx)\n", This, uriProp, pcchProperty, dwFlags);
return E_NOTIMPL;
}
@ -4270,7 +4270,7 @@ static HRESULT WINAPI Uri_GetPropertyLength(IUri *iface, Uri_PROPERTY uriProp, D
hres = (This->userinfo_start > -1) ? S_OK : S_FALSE;
break;
default:
FIXME("(%p)->(%d %p %x)\n", This, uriProp, pcchProperty, dwFlags);
FIXME("(%p)->(%d %p %lx)\n", This, uriProp, pcchProperty, dwFlags);
hres = E_NOTIMPL;
}
@ -4282,7 +4282,7 @@ static HRESULT WINAPI Uri_GetPropertyDWORD(IUri *iface, Uri_PROPERTY uriProp, DW
Uri *This = impl_from_IUri(iface);
HRESULT hres;
TRACE("(%p %s)->(%d %p %x)\n", This, debugstr_w(This->canon_uri), uriProp, pcchProperty, dwFlags);
TRACE("(%p %s)->(%d %p %lx)\n", This, debugstr_w(This->canon_uri), uriProp, pcchProperty, dwFlags);
if(!This->create_flags)
return E_UNEXPECTED;
@ -4324,7 +4324,7 @@ static HRESULT WINAPI Uri_GetPropertyDWORD(IUri *iface, Uri_PROPERTY uriProp, DW
hres = S_OK;
break;
default:
FIXME("(%p)->(%d %p %x)\n", This, uriProp, pcchProperty, dwFlags);
FIXME("(%p)->(%d %p %lx)\n", This, uriProp, pcchProperty, dwFlags);
hres = E_NOTIMPL;
}
@ -4662,7 +4662,7 @@ static HRESULT WINAPI UriBuilderFactory_CreateIUriBuilder(IUriBuilderFactory *if
IUriBuilder **ppIUriBuilder)
{
Uri *This = impl_from_IUriBuilderFactory(iface);
TRACE("(%p)->(%08x %08x %p)\n", This, dwFlags, (DWORD)dwReserved, ppIUriBuilder);
TRACE("(%p)->(%08lx %08lx %p)\n", This, dwFlags, (DWORD)dwReserved, ppIUriBuilder);
if(!ppIUriBuilder)
return E_POINTER;
@ -4681,7 +4681,7 @@ static HRESULT WINAPI UriBuilderFactory_CreateInitializedIUriBuilder(IUriBuilder
IUriBuilder **ppIUriBuilder)
{
Uri *This = impl_from_IUriBuilderFactory(iface);
TRACE("(%p)->(%08x %08x %p)\n", This, dwFlags, (DWORD)dwReserved, ppIUriBuilder);
TRACE("(%p)->(%08lx %08lx %p)\n", This, dwFlags, (DWORD)dwReserved, ppIUriBuilder);
if(!ppIUriBuilder)
return E_POINTER;
@ -4798,7 +4798,7 @@ static HRESULT WINAPI PersistStream_Load(IPersistStream *iface, IStream *pStm)
}
This->create_flags = data->create_flags;
heap_free(data);
TRACE("%x %s\n", This->create_flags, debugstr_w(This->raw_uri));
TRACE("%lx %s\n", This->create_flags, debugstr_w(This->raw_uri));
memset(&parse, 0, sizeof(parse_data));
parse.uri = This->raw_uri;
@ -5022,7 +5022,7 @@ static HRESULT WINAPI Marshal_GetUnmarshalClass(IMarshal *iface, REFIID riid, vo
DWORD dwDestContext, void *pvDestContext, DWORD mshlflags, CLSID *pCid)
{
Uri *This = impl_from_IMarshal(iface);
TRACE("(%p)->(%s %p %x %p %x %p)\n", This, debugstr_guid(riid), pv,
TRACE("(%p)->(%s %p %lx %p %lx %p)\n", This, debugstr_guid(riid), pv,
dwDestContext, pvDestContext, mshlflags, pCid);
if(!pCid || (dwDestContext!=MSHCTX_LOCAL && dwDestContext!=MSHCTX_NOSHAREDMEM
@ -5046,7 +5046,7 @@ static HRESULT WINAPI Marshal_GetMarshalSizeMax(IMarshal *iface, REFIID riid, vo
Uri *This = impl_from_IMarshal(iface);
ULARGE_INTEGER size;
HRESULT hres;
TRACE("(%p)->(%s %p %x %p %x %p)\n", This, debugstr_guid(riid), pv,
TRACE("(%p)->(%s %p %lx %p %lx %p)\n", This, debugstr_guid(riid), pv,
dwDestContext, pvDestContext, mshlflags, pSize);
if(!pSize || (dwDestContext!=MSHCTX_LOCAL && dwDestContext!=MSHCTX_NOSHAREDMEM
@ -5077,7 +5077,7 @@ static HRESULT WINAPI Marshal_MarshalInterface(IMarshal *iface, IStream *pStm, R
DWORD size;
HRESULT hres;
TRACE("(%p)->(%p %s %p %x %p %x)\n", This, pStm, debugstr_guid(riid), pv,
TRACE("(%p)->(%p %s %p %lx %p %lx)\n", This, pStm, debugstr_guid(riid), pv,
dwDestContext, pvDestContext, mshlflags);
if(!pStm || mshlflags!=MSHLFLAGS_NORMAL || (dwDestContext!=MSHCTX_LOCAL
@ -5215,7 +5215,7 @@ static HRESULT WINAPI Marshal_ReleaseMarshalData(IMarshal *iface, IStream *pStm)
static HRESULT WINAPI Marshal_DisconnectObject(IMarshal *iface, DWORD dwReserved)
{
Uri *This = impl_from_IMarshal(iface);
TRACE("(%p)->(%x)\n", This, dwReserved);
TRACE("(%p)->(%lx)\n", This, dwReserved);
return S_OK;
}
@ -5286,7 +5286,7 @@ HRESULT WINAPI CreateUri(LPCWSTR pwzURI, DWORD dwFlags, DWORD_PTR dwReserved, IU
HRESULT hr;
parse_data data;
TRACE("(%s %x %x %p)\n", debugstr_w(pwzURI), dwFlags, (DWORD)dwReserved, ppURI);
TRACE("(%s %lx %lx %p)\n", debugstr_w(pwzURI), dwFlags, (DWORD)dwReserved, ppURI);
if(!ppURI)
return E_INVALIDARG;
@ -5304,7 +5304,7 @@ HRESULT WINAPI CreateUri(LPCWSTR pwzURI, DWORD dwFlags, DWORD_PTR dwReserved, IU
/* Currently unsupported. */
if(dwFlags & ~supported_flags)
FIXME("Ignoring unsupported flag(s) %x\n", dwFlags & ~supported_flags);
FIXME("Ignoring unsupported flag(s) %lx\n", dwFlags & ~supported_flags);
hr = Uri_Construct(NULL, (void**)&ret);
if(FAILED(hr)) {
@ -5374,7 +5374,7 @@ HRESULT WINAPI CreateUriWithFragment(LPCWSTR pwzURI, LPCWSTR pwzFragment, DWORD
DWORD_PTR dwReserved, IUri **ppURI)
{
HRESULT hres;
TRACE("(%s %s %x %x %p)\n", debugstr_w(pwzURI), debugstr_w(pwzFragment), dwFlags, (DWORD)dwReserved, ppURI);
TRACE("(%s %s %lx %lx %p)\n", debugstr_w(pwzURI), debugstr_w(pwzFragment), dwFlags, (DWORD)dwReserved, ppURI);
if(!ppURI)
return E_INVALIDARG;
@ -5513,7 +5513,7 @@ static ULONG WINAPI UriBuilder_AddRef(IUriBuilder *iface)
UriBuilder *This = impl_from_IUriBuilder(iface);
LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref);
TRACE("(%p) ref=%ld\n", This, ref);
return ref;
}
@ -5523,7 +5523,7 @@ static ULONG WINAPI UriBuilder_Release(IUriBuilder *iface)
UriBuilder *This = impl_from_IUriBuilder(iface);
LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref);
TRACE("(%p) ref=%ld\n", This, ref);
if(!ref) {
if(This->uri) IUri_Release(&This->uri->IUri_iface);
@ -5547,11 +5547,11 @@ static HRESULT WINAPI UriBuilder_CreateUriSimple(IUriBuilder *iface,
{
UriBuilder *This = impl_from_IUriBuilder(iface);
HRESULT hr;
TRACE("(%p)->(%d %d %p)\n", This, dwAllowEncodingPropertyMask, (DWORD)dwReserved, ppIUri);
TRACE("(%p)->(%ld %ld %p)\n", This, dwAllowEncodingPropertyMask, (DWORD)dwReserved, ppIUri);
hr = build_uri(This, ppIUri, 0, UriBuilder_USE_ORIGINAL_FLAGS, dwAllowEncodingPropertyMask);
if(hr == E_NOTIMPL)
FIXME("(%p)->(%d %d %p)\n", This, dwAllowEncodingPropertyMask, (DWORD)dwReserved, ppIUri);
FIXME("(%p)->(%ld %ld %p)\n", This, dwAllowEncodingPropertyMask, (DWORD)dwReserved, ppIUri);
return hr;
}
@ -5563,7 +5563,7 @@ static HRESULT WINAPI UriBuilder_CreateUri(IUriBuilder *iface,
{
UriBuilder *This = impl_from_IUriBuilder(iface);
HRESULT hr;
TRACE("(%p)->(0x%08x %d %d %p)\n", This, dwCreateFlags, dwAllowEncodingPropertyMask, (DWORD)dwReserved, ppIUri);
TRACE("(%p)->(0x%08lx %ld %ld %p)\n", This, dwCreateFlags, dwAllowEncodingPropertyMask, (DWORD)dwReserved, ppIUri);
if(dwCreateFlags == -1)
hr = build_uri(This, ppIUri, 0, UriBuilder_USE_ORIGINAL_FLAGS, dwAllowEncodingPropertyMask);
@ -5571,7 +5571,7 @@ static HRESULT WINAPI UriBuilder_CreateUri(IUriBuilder *iface,
hr = build_uri(This, ppIUri, dwCreateFlags, 0, dwAllowEncodingPropertyMask);
if(hr == E_NOTIMPL)
FIXME("(%p)->(0x%08x %d %d %p)\n", This, dwCreateFlags, dwAllowEncodingPropertyMask, (DWORD)dwReserved, ppIUri);
FIXME("(%p)->(0x%08lx %ld %ld %p)\n", This, dwCreateFlags, dwAllowEncodingPropertyMask, (DWORD)dwReserved, ppIUri);
return hr;
}
@ -5584,12 +5584,12 @@ static HRESULT WINAPI UriBuilder_CreateUriWithFlags(IUriBuilder *iface,
{
UriBuilder *This = impl_from_IUriBuilder(iface);
HRESULT hr;
TRACE("(%p)->(0x%08x 0x%08x %d %d %p)\n", This, dwCreateFlags, dwUriBuilderFlags,
TRACE("(%p)->(0x%08lx 0x%08lx %ld %ld %p)\n", This, dwCreateFlags, dwUriBuilderFlags,
dwAllowEncodingPropertyMask, (DWORD)dwReserved, ppIUri);
hr = build_uri(This, ppIUri, dwCreateFlags, dwUriBuilderFlags, dwAllowEncodingPropertyMask);
if(hr == E_NOTIMPL)
FIXME("(%p)->(0x%08x 0x%08x %d %d %p)\n", This, dwCreateFlags, dwUriBuilderFlags,
FIXME("(%p)->(0x%08lx 0x%08lx %ld %ld %p)\n", This, dwCreateFlags, dwUriBuilderFlags,
dwAllowEncodingPropertyMask, (DWORD)dwReserved, ppIUri);
return hr;
}
@ -5807,7 +5807,7 @@ static HRESULT WINAPI UriBuilder_SetPath(IUriBuilder *iface, LPCWSTR pwzNewValue
static HRESULT WINAPI UriBuilder_SetPort(IUriBuilder *iface, BOOL fHasPort, DWORD dwNewValue)
{
UriBuilder *This = impl_from_IUriBuilder(iface);
TRACE("(%p)->(%d %d)\n", This, fHasPort, dwNewValue);
TRACE("(%p)->(%d %ld)\n", This, fHasPort, dwNewValue);
This->has_port = fHasPort;
This->port = dwNewValue;
@ -5851,7 +5851,7 @@ static HRESULT WINAPI UriBuilder_RemoveProperties(IUriBuilder *iface, DWORD dwPr
Uri_HAS_USER_INFO|Uri_HAS_USER_NAME;
UriBuilder *This = impl_from_IUriBuilder(iface);
TRACE("(%p)->(0x%08x)\n", This, dwPropertyMask);
TRACE("(%p)->(0x%08lx)\n", This, dwPropertyMask);
if(dwPropertyMask & ~accepted_flags)
return E_INVALIDARG;
@ -5932,7 +5932,7 @@ HRESULT WINAPI CreateIUriBuilder(IUri *pIUri, DWORD dwFlags, DWORD_PTR dwReserve
{
UriBuilder *ret;
TRACE("(%p %x %x %p)\n", pIUri, dwFlags, (DWORD)dwReserved, ppIUriBuilder);
TRACE("(%p %lx %lx %p)\n", pIUri, dwFlags, (DWORD)dwReserved, ppIUriBuilder);
if(!ppIUriBuilder)
return E_POINTER;
@ -5962,7 +5962,7 @@ HRESULT WINAPI CreateIUriBuilder(IUri *pIUri, DWORD dwFlags, DWORD_PTR dwReserve
} else {
heap_free(ret);
*ppIUriBuilder = NULL;
FIXME("(%p %x %x %p): Unknown IUri types not supported yet.\n", pIUri, dwFlags,
FIXME("(%p %lx %lx %p): Unknown IUri types not supported yet.\n", pIUri, dwFlags,
(DWORD)dwReserved, ppIUriBuilder);
return E_NOTIMPL;
}
@ -6295,7 +6295,7 @@ HRESULT WINAPI CoInternetCombineIUri(IUri *pBaseUri, IUri *pRelativeUri, DWORD d
HRESULT hr;
IInternetProtocolInfo *info;
Uri *relative, *base;
TRACE("(%p %p %x %p %x)\n", pBaseUri, pRelativeUri, dwCombineFlags, ppCombinedUri, (DWORD)dwReserved);
TRACE("(%p %p %lx %p %lx)\n", pBaseUri, pRelativeUri, dwCombineFlags, ppCombinedUri, (DWORD)dwReserved);
if(!ppCombinedUri)
return E_INVALIDARG;
@ -6309,7 +6309,7 @@ HRESULT WINAPI CoInternetCombineIUri(IUri *pBaseUri, IUri *pRelativeUri, DWORD d
base = get_uri_obj(pBaseUri);
if(!relative || !base) {
*ppCombinedUri = NULL;
FIXME("(%p %p %x %p %x) Unknown IUri types not supported yet.\n",
FIXME("(%p %p %lx %p %lx) Unknown IUri types not supported yet.\n",
pBaseUri, pRelativeUri, dwCombineFlags, ppCombinedUri, (DWORD)dwReserved);
return E_NOTIMPL;
}
@ -6343,7 +6343,7 @@ HRESULT WINAPI CoInternetCombineUrlEx(IUri *pBaseUri, LPCWSTR pwzRelativeUrl, DW
HRESULT hr;
IInternetProtocolInfo *info;
TRACE("(%p %s %x %p %x)\n", pBaseUri, debugstr_w(pwzRelativeUrl), dwCombineFlags,
TRACE("(%p %s %lx %p %lx)\n", pBaseUri, debugstr_w(pwzRelativeUrl), dwCombineFlags,
ppCombinedUri, (DWORD)dwReserved);
if(!ppCombinedUri)
@ -6362,7 +6362,7 @@ HRESULT WINAPI CoInternetCombineUrlEx(IUri *pBaseUri, LPCWSTR pwzRelativeUrl, DW
base = get_uri_obj(pBaseUri);
if(!base) {
*ppCombinedUri = NULL;
FIXME("(%p %s %x %p %x) Unknown IUri's not supported yet.\n", pBaseUri, debugstr_w(pwzRelativeUrl),
FIXME("(%p %s %lx %p %lx) Unknown IUri's not supported yet.\n", pBaseUri, debugstr_w(pwzRelativeUrl),
dwCombineFlags, ppCombinedUri, (DWORD)dwReserved);
return E_NOTIMPL;
}
@ -6828,7 +6828,7 @@ HRESULT WINAPI CoInternetParseIUri(IUri *pIUri, PARSEACTION ParseAction, DWORD d
Uri *uri;
IInternetProtocolInfo *info;
TRACE("(%p %d %x %p %d %p %x)\n", pIUri, ParseAction, dwFlags, pwzResult,
TRACE("(%p %d %lx %p %ld %p %lx)\n", pIUri, ParseAction, dwFlags, pwzResult,
cchResult, pcchResult, (DWORD)dwReserved);
if(!pcchResult)
@ -6841,7 +6841,7 @@ HRESULT WINAPI CoInternetParseIUri(IUri *pIUri, PARSEACTION ParseAction, DWORD d
if(!(uri = get_uri_obj(pIUri))) {
*pcchResult = 0;
FIXME("(%p %d %x %p %d %p %x) Unknown IUri's not supported for this action.\n",
FIXME("(%p %d %lx %p %ld %p %lx) Unknown IUri's not supported for this action.\n",
pIUri, ParseAction, dwFlags, pwzResult, cchResult, pcchResult, (DWORD)dwReserved);
return E_NOTIMPL;
}
@ -6896,7 +6896,7 @@ HRESULT WINAPI CoInternetParseIUri(IUri *pIUri, PARSEACTION ParseAction, DWORD d
default:
*pcchResult = 0;
hr = E_NOTIMPL;
FIXME("(%p %d %x %p %d %p %x) Partial stub.\n", pIUri, ParseAction, dwFlags,
FIXME("(%p %d %lx %p %ld %p %lx) Partial stub.\n", pIUri, ParseAction, dwFlags,
pwzResult, cchResult, pcchResult, (DWORD)dwReserved);
}

26
dlls/urlmon/urlmon_main.c
View File

@ -149,7 +149,7 @@ static void process_detach(void)
*/
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
{
TRACE("%p 0x%x %p\n", hinstDLL, fdwReason, fImpLoad);
TRACE("%p 0x%lx %p\n", hinstDLL, fdwReason, fImpLoad);
URLMON_DllMain( hinstDLL, fdwReason, fImpLoad );
@ -230,7 +230,7 @@ const char *debugstr_bindstatus(ULONG status)
X(BINDSTATUS_DISPLAYNAMEAVAILABLE);
#undef X
default:
return wine_dbg_sprintf("(invalid status %u)", status);
return wine_dbg_sprintf("(invalid status %lu)", status);
}
}
@ -515,7 +515,7 @@ HRESULT WINAPI DllRegisterServerEx(void)
*/
HRESULT WINAPI IsValidURL(LPBC pBC, LPCWSTR szURL, DWORD dwReserved)
{
FIXME("(%p, %s, %d): stub\n", pBC, debugstr_w(szURL), dwReserved);
FIXME("(%p, %s, %ld): stub\n", pBC, debugstr_w(szURL), dwReserved);
if (dwReserved || !szURL)
return E_INVALIDARG;
@ -531,7 +531,7 @@ HRESULT WINAPI IsValidURL(LPBC pBC, LPCWSTR szURL, DWORD dwReserved)
HRESULT WINAPI FaultInIEFeature( HWND hwnd, uCLSSPEC * pClassSpec,
QUERYCONTEXT *pQuery, DWORD flags )
{
FIXME("%p %p %p %08x\n", hwnd, pClassSpec, pQuery, flags);
FIXME("%p %p %p %08lx\n", hwnd, pClassSpec, pQuery, flags);
return E_NOTIMPL;
}
@ -543,7 +543,7 @@ HRESULT WINAPI CoGetClassObjectFromURL( REFCLSID rclsid, LPCWSTR szCodeURL, DWOR
LPBINDCTX pBindCtx, DWORD dwClsContext, LPVOID pvReserved,
REFIID riid, LPVOID *ppv )
{
FIXME("(%s %s %d %d %s %p %d %p %s %p) Stub!\n", debugstr_guid(rclsid), debugstr_w(szCodeURL),
FIXME("(%s %s %ld %ld %s %p %ld %p %s %p) Stub!\n", debugstr_guid(rclsid), debugstr_w(szCodeURL),
dwFileVersionMS, dwFileVersionLS, debugstr_w(szContentType), pBindCtx, dwClsContext, pvReserved,
debugstr_guid(riid), ppv);
return E_NOINTERFACE;
@ -630,7 +630,7 @@ HRESULT WINAPI CopyStgMedium(const STGMEDIUM *src, STGMEDIUM *dst)
}
break;
default:
FIXME("Unimplemented tymed %d\n", src->tymed);
FIXME("Unimplemented tymed %ld\n", src->tymed);
}
if(dst->pUnkForRelease)
@ -712,7 +712,7 @@ HRESULT WINAPI GetClassFileOrMime(LPBC pBC, LPCWSTR pszFilename,
LPVOID pBuffer, DWORD cbBuffer, LPCWSTR pszMimeType, DWORD dwReserved,
CLSID *pclsid)
{
FIXME("(%p, %s, %p, %d, %s, 0x%08x, %p): stub\n", pBC, debugstr_w(pszFilename), pBuffer,
FIXME("(%p, %s, %p, %ld, %s, 0x%08lx, %p): stub\n", pBC, debugstr_w(pszFilename), pBuffer,
cbBuffer, debugstr_w(pszMimeType), dwReserved, pclsid);
return E_NOTIMPL;
}
@ -768,7 +768,7 @@ BOOL WINAPI IsProtectedModeURL(const WCHAR *url)
*/
int WINAPI LogSqmBits(DWORD unk1, DWORD unk2)
{
FIXME("stub: %d %d\n", unk1, unk2);
FIXME("stub: %ld %ld\n", unk1, unk2);
return 0;
}
@ -778,7 +778,7 @@ int WINAPI LogSqmBits(DWORD unk1, DWORD unk2)
*/
void WINAPI LogSqmUXCommandOffsetInternal(DWORD unk1, DWORD unk2, DWORD unk3, DWORD unk4)
{
FIXME("stub: %d %d %d %d\n", unk1, unk2, unk3, unk4);
FIXME("stub: %ld %ld %ld %ld\n", unk1, unk2, unk3, unk4);
}
/***********************************************************************
@ -787,7 +787,7 @@ void WINAPI LogSqmUXCommandOffsetInternal(DWORD unk1, DWORD unk2, DWORD unk3, DW
*/
int WINAPI MapUriToBrowserEmulationState(DWORD unk1, DWORD unk2, DWORD unk3)
{
FIXME("stub: %d %d %d\n", unk1, unk2, unk3);
FIXME("stub: %ld %ld %ld\n", unk1, unk2, unk3);
return 0;
}
@ -797,7 +797,7 @@ int WINAPI MapUriToBrowserEmulationState(DWORD unk1, DWORD unk2, DWORD unk3)
*/
int WINAPI MapBrowserEmulationModeToUserAgent(DWORD unk1, DWORD unk2)
{
FIXME("stub: %d %d\n", unk1, unk2);
FIXME("stub: %ld %ld\n", unk1, unk2);
return 0;
}
@ -807,7 +807,7 @@ int WINAPI MapBrowserEmulationModeToUserAgent(DWORD unk1, DWORD unk2)
*/
HRESULT WINAPI CoInternetGetBrowserProfile(DWORD unk)
{
FIXME("%x: stub\n", unk);
FIXME("%lx: stub\n", unk);
return E_NOTIMPL;
}
@ -836,7 +836,7 @@ HRESULT WINAPI RegisterMediaTypes(UINT types, LPCSTR *szTypes, CLIPFORMAT *cfTyp
*/
BOOL WINAPI ShouldShowIntranetWarningSecband(DWORD unk)
{
FIXME("%x: stub\n", unk);
FIXME("%lx: stub\n", unk);
return FALSE;
}

18
dlls/urlmon/usrmarshal.c
View File

@ -28,7 +28,7 @@ HRESULT CALLBACK IWinInetHttpInfo_QueryInfo_Proxy(IWinInetHttpInfo* This,
DWORD dwOption, LPVOID pBuffer, DWORD *pcbBuf, DWORD *pdwFlags,
DWORD *pdwReserved)
{
TRACE("(%p %x %p %p %p %p)\n", This, dwOption, pBuffer, pcbBuf, pdwFlags, pdwReserved);
TRACE("(%p %lx %p %p %p %p)\n", This, dwOption, pBuffer, pcbBuf, pdwFlags, pdwReserved);
return IWinInetHttpInfo_RemoteQueryInfo_Proxy(This, dwOption, pBuffer, pcbBuf, pdwFlags, pdwReserved);
}
@ -36,21 +36,21 @@ HRESULT __RPC_STUB IWinInetHttpInfo_QueryInfo_Stub(IWinInetHttpInfo* This,
DWORD dwOption, BYTE *pBuffer, DWORD *pcbBuf, DWORD *pdwFlags,
DWORD *pdwReserved)
{
TRACE("(%p %x %p %p %p %p)\n", This, dwOption, pBuffer, pcbBuf, pdwFlags, pdwReserved);
TRACE("(%p %lx %p %p %p %p)\n", This, dwOption, pBuffer, pcbBuf, pdwFlags, pdwReserved);
return IWinInetHttpInfo_QueryInfo(This, dwOption, pBuffer, pcbBuf, pdwFlags, pdwReserved);
}
HRESULT CALLBACK IWinInetInfo_QueryOption_Proxy(IWinInetInfo* This,
DWORD dwOption, LPVOID pBuffer, DWORD *pcbBuf)
{
TRACE("(%p %x %p %p)\n", This, dwOption, pBuffer, pcbBuf);
TRACE("(%p %lx %p %p)\n", This, dwOption, pBuffer, pcbBuf);
return IWinInetInfo_RemoteQueryOption_Proxy(This, dwOption, pBuffer, pcbBuf);
}
HRESULT __RPC_STUB IWinInetInfo_QueryOption_Stub(IWinInetInfo* This,
DWORD dwOption, BYTE *pBuffer, DWORD *pcbBuf)
{
TRACE("(%p %x %p %p)\n", This, dwOption, pBuffer, pcbBuf);
TRACE("(%p %lx %p %p)\n", This, dwOption, pBuffer, pcbBuf);
return IWinInetInfo_QueryOption(This, dwOption, pBuffer, pcbBuf);
}
@ -108,7 +108,7 @@ static HRESULT marshal_stgmed(STGMEDIUM *stgmed, RemSTGMEDIUM **ret)
MSHCTX_LOCAL, NULL, MSHLFLAGS_NORMAL);
break;
default:
FIXME("unsupported tymed %u\n", stgmed->tymed);
FIXME("unsupported tymed %lu\n", stgmed->tymed);
break;
}
@ -184,7 +184,7 @@ static HRESULT unmarshal_stgmed(RemSTGMEDIUM *rem_stgmed, STGMEDIUM *stgmed)
hres = CoUnmarshalInterface(stream, &IID_IStream, (void**)&stgmed->u.pstm);
break;
default:
FIXME("unsupported tymed %u\n", stgmed->tymed);
FIXME("unsupported tymed %lu\n", stgmed->tymed);
break;
}
@ -227,7 +227,7 @@ static void stub_unmarshal_bindinfo(RemBINDINFO *rem_bindinfo, BINDINFO *bindinf
bindinfo->cbstgmedData = rem_bindinfo->cbstgmedData;
if(bindinfo->stgmedData.tymed != TYMED_NULL)
WARN("stgmed data (tymed %u) will be lost!\n", bindinfo->stgmedData.tymed);
WARN("stgmed data (tymed %lu) will be lost!\n", bindinfo->stgmedData.tymed);
}
static void stub_marshal_bindinfo(BINDINFO *bindinfo, RemBINDINFO *rem_bindinfo)
@ -319,7 +319,7 @@ HRESULT CALLBACK IBindStatusCallback_OnDataAvailable_Proxy(
RemSTGMEDIUM *rem_stgmed;
HRESULT hres;
TRACE("(%p)->(%x %u %p %p)\n", This, grfBSCF, dwSize, pformatetc, pstgmed);
TRACE("(%p)->(%lx %lu %p %p)\n", This, grfBSCF, dwSize, pformatetc, pstgmed);
hres = marshal_stgmed(pstgmed, &rem_stgmed);
if(FAILED(hres))
@ -345,7 +345,7 @@ HRESULT __RPC_STUB IBindStatusCallback_OnDataAvailable_Stub(
FORMATETC formatetc;
HRESULT hres;
TRACE("(%p)->(%x %u %p %p)\n", This, grfBSCF, dwSize, pformatetc, pstgmed);
TRACE("(%p)->(%lx %lu %p %p)\n", This, grfBSCF, dwSize, pformatetc, pstgmed);
hres = unmarshal_stgmed(pstgmed, &stgmed);
if(FAILED(hres))