system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 07:44:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

urlmon: Win64 printf format warning fixes.

Browse source
This commit is contained in:
Jacek Caban 2006-10-05 23:49:11 +02:00 committed by Alexandre Julliard
parent 90fc08d1ba
commit 7e340f8f62
12 changed files with 144 additions and 145 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dlls/urlmon/Makefile.in
View file

@ -6,7 +6,6 @@ MODULE = urlmon.dll
IMPORTLIB = liburlmon.$(IMPLIBEXT) IMPORTLIB = liburlmon.$(IMPLIBEXT)
IMPORTS = ole32 shlwapi wininet user32 advapi32 kernel32 ntdll IMPORTS = ole32 shlwapi wininet user32 advapi32 kernel32 ntdll
EXTRALIBS = -luuid EXTRALIBS = -luuid
EXTRADEFS = -DWINE_NO_LONG_AS_INT
C_SRCS = \ C_SRCS = \
binding.c \ binding.c \

62
dlls/urlmon/binding.c
View file

@ -321,15 +321,15 @@ static void dump_BINDINFO(BINDINFO *bi)
TRACE("\n" TRACE("\n"
"BINDINFO = {\n" "BINDINFO = {\n"
" %ld, %s,\n" " %d, %s,\n"
" {%ld, %p, %p},\n" " {%d, %p, %p},\n"
" %s,\n" " %s,\n"
" %s,\n" " %s,\n"
" %s,\n" " %s,\n"
" %ld, %08lx, %ld, %ld\n" " %d, %08x, %d, %d\n"
" {%ld %p %x},\n" " {%d %p %x},\n"
" %s\n" " %s\n"
" %p, %ld\n" " %p, %d\n"
"}\n", "}\n",
bi->cbSize, debugstr_w(bi->szExtraInfo), bi->cbSize, debugstr_w(bi->szExtraInfo),
@ -388,7 +388,7 @@ static ULONG WINAPI HttpNegotiate_Release(IHttpNegotiate2 *iface)
static HRESULT WINAPI HttpNegotiate_BeginningTransaction(IHttpNegotiate2 *iface, static HRESULT WINAPI HttpNegotiate_BeginningTransaction(IHttpNegotiate2 *iface,
LPCWSTR szURL, LPCWSTR szHeaders, DWORD dwReserved, LPWSTR *pszAdditionalHeaders) LPCWSTR szURL, LPCWSTR szHeaders, DWORD dwReserved, LPWSTR *pszAdditionalHeaders)
{ {
TRACE("(%s %s %ld %p)\n", debugstr_w(szURL), debugstr_w(szHeaders), dwReserved, TRACE("(%s %s %d %p)\n", debugstr_w(szURL), debugstr_w(szHeaders), dwReserved,
pszAdditionalHeaders); pszAdditionalHeaders);
*pszAdditionalHeaders = NULL; *pszAdditionalHeaders = NULL;
@ -399,7 +399,7 @@ static HRESULT WINAPI HttpNegotiate_OnResponse(IHttpNegotiate2 *iface, DWORD dwR
LPCWSTR szResponseHeaders, LPCWSTR szRequestHeaders, LPCWSTR szResponseHeaders, LPCWSTR szRequestHeaders,
LPWSTR *pszAdditionalRequestHeaders) LPWSTR *pszAdditionalRequestHeaders)
{ {
TRACE("(%ld %s %s %p)\n", dwResponseCode, debugstr_w(szResponseHeaders), TRACE("(%d %s %s %p)\n", dwResponseCode, debugstr_w(szResponseHeaders),
debugstr_w(szRequestHeaders), pszAdditionalRequestHeaders); debugstr_w(szRequestHeaders), pszAdditionalRequestHeaders);
if(pszAdditionalRequestHeaders) if(pszAdditionalRequestHeaders)
@ -461,7 +461,7 @@ static ULONG WINAPI ProtocolStream_AddRef(IStream *iface)
ProtocolStream *This = STREAM_THIS(iface); ProtocolStream *This = STREAM_THIS(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%ld\n", This, ref); TRACE("(%p) ref=%d\n", This, ref);
return ref; return ref;
} }
@ -471,7 +471,7 @@ static ULONG WINAPI ProtocolStream_Release(IStream *iface)
ProtocolStream *This = STREAM_THIS(iface); ProtocolStream *This = STREAM_THIS(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%ld\n", This, ref); TRACE("(%p) ref=%d\n", This, ref);
if(!ref) { if(!ref) {
IInternetProtocol_Release(This->protocol); IInternetProtocol_Release(This->protocol);
@ -490,7 +490,7 @@ static HRESULT WINAPI ProtocolStream_Read(IStream *iface, void *pv,
DWORD read = 0, pread = 0; DWORD read = 0, pread = 0;
HRESULT hres; HRESULT hres;
TRACE("(%p)->(%p %ld %p)\n", This, pv, cb, pcbRead); TRACE("(%p)->(%p %d %p)\n", This, pv, cb, pcbRead);
if(This->buf_size) { if(This->buf_size) {
read = cb; read = cb;
@ -516,7 +516,7 @@ static HRESULT WINAPI ProtocolStream_Read(IStream *iface, void *pv,
if(hres == E_PENDING) if(hres == E_PENDING)
return E_PENDING; return E_PENDING;
else if(FAILED(hres)) else if(FAILED(hres))
FIXME("Read failed: %08lx\n", hres); FIXME("Read failed: %08x\n", hres);
return read || pread ? S_OK : S_FALSE; return read || pread ? S_OK : S_FALSE;
} }
@ -526,7 +526,7 @@ static HRESULT WINAPI ProtocolStream_Write(IStream *iface, const void *pv,
{ {
ProtocolStream *This = STREAM_THIS(iface); ProtocolStream *This = STREAM_THIS(iface);
TRACE("(%p)->(%p %ld %p)\n", This, pv, cb, pcbWritten); TRACE("(%p)->(%p %d %p)\n", This, pv, cb, pcbWritten);
return STG_E_ACCESSDENIED; return STG_E_ACCESSDENIED;
} }
@ -535,14 +535,14 @@ static HRESULT WINAPI ProtocolStream_Seek(IStream *iface, LARGE_INTEGER dlibMove
DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition)
{ {
ProtocolStream *This = STREAM_THIS(iface); ProtocolStream *This = STREAM_THIS(iface);
FIXME("(%p)->(%ld %08lx %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); FIXME("(%p)->(%d %08x %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI ProtocolStream_SetSize(IStream *iface, ULARGE_INTEGER libNewSize) static HRESULT WINAPI ProtocolStream_SetSize(IStream *iface, ULARGE_INTEGER libNewSize)
{ {
ProtocolStream *This = STREAM_THIS(iface); ProtocolStream *This = STREAM_THIS(iface);
FIXME("(%p)->(%ld)\n", This, libNewSize.u.LowPart); FIXME("(%p)->(%d)\n", This, libNewSize.u.LowPart);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -550,7 +550,7 @@ static HRESULT WINAPI ProtocolStream_CopyTo(IStream *iface, IStream *pstm,
ULARGE_INTEGER cb, ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *pcbWritten) ULARGE_INTEGER cb, ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *pcbWritten)
{ {
ProtocolStream *This = STREAM_THIS(iface); ProtocolStream *This = STREAM_THIS(iface);
FIXME("(%p)->(%p %ld %p %p)\n", This, pstm, cb.u.LowPart, pcbRead, pcbWritten); FIXME("(%p)->(%p %d %p %p)\n", This, pstm, cb.u.LowPart, pcbRead, pcbWritten);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -558,7 +558,7 @@ static HRESULT WINAPI ProtocolStream_Commit(IStream *iface, DWORD grfCommitFlags
{ {
ProtocolStream *This = STREAM_THIS(iface); ProtocolStream *This = STREAM_THIS(iface);
TRACE("(%p)->(%08lx)\n", This, grfCommitFlags); TRACE("(%p)->(%08x)\n", This, grfCommitFlags);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -576,7 +576,7 @@ static HRESULT WINAPI ProtocolStream_LockRegion(IStream *iface, ULARGE_INTEGER l
ULARGE_INTEGER cb, DWORD dwLockType) ULARGE_INTEGER cb, DWORD dwLockType)
{ {
ProtocolStream *This = STREAM_THIS(iface); ProtocolStream *This = STREAM_THIS(iface);
FIXME("(%p)->(%ld %ld %ld)\n", This, libOffset.u.LowPart, cb.u.LowPart, dwLockType); FIXME("(%p)->(%d %d %d)\n", This, libOffset.u.LowPart, cb.u.LowPart, dwLockType);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -584,7 +584,7 @@ static HRESULT WINAPI ProtocolStream_UnlockRegion(IStream *iface,
ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType)
{ {
ProtocolStream *This = STREAM_THIS(iface); ProtocolStream *This = STREAM_THIS(iface);
FIXME("(%p)->(%ld %ld %ld)\n", This, libOffset.u.LowPart, cb.u.LowPart, dwLockType); FIXME("(%p)->(%d %d %d)\n", This, libOffset.u.LowPart, cb.u.LowPart, dwLockType);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -592,7 +592,7 @@ static HRESULT WINAPI ProtocolStream_Stat(IStream *iface, STATSTG *pstatstg,
DWORD dwStatFlag) DWORD dwStatFlag)
{ {
ProtocolStream *This = STREAM_THIS(iface); ProtocolStream *This = STREAM_THIS(iface);
FIXME("(%p)->(%p %08lx)\n", This, pstatstg, dwStatFlag); FIXME("(%p)->(%p %08x)\n", This, pstatstg, dwStatFlag);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -678,7 +678,7 @@ static ULONG WINAPI Binding_AddRef(IBinding *iface)
Binding *This = BINDING_THIS(iface); Binding *This = BINDING_THIS(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%ld\n", This, ref); TRACE("(%p) ref=%d\n", This, ref);
return ref; return ref;
} }
@ -688,7 +688,7 @@ static ULONG WINAPI Binding_Release(IBinding *iface)
Binding *This = BINDING_THIS(iface); Binding *This = BINDING_THIS(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%ld\n", This, ref); TRACE("(%p) ref=%d\n", This, ref);
if(!ref) { if(!ref) {
if(This->callback) if(This->callback)
@ -737,7 +737,7 @@ static HRESULT WINAPI Binding_Resume(IBinding *iface)
static HRESULT WINAPI Binding_SetPriority(IBinding *iface, LONG nPriority) static HRESULT WINAPI Binding_SetPriority(IBinding *iface, LONG nPriority)
{ {
Binding *This = BINDING_THIS(iface); Binding *This = BINDING_THIS(iface);
FIXME("(%p)->(%ld)\n", This, nPriority); FIXME("(%p)->(%d)\n", This, nPriority);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -816,7 +816,7 @@ static HRESULT WINAPI InternetProtocolSink_ReportProgress(IInternetProtocolSink
{ {
Binding *This = PROTSINK_THIS(iface); Binding *This = PROTSINK_THIS(iface);
TRACE("(%p)->(%lu %s)\n", This, ulStatusCode, debugstr_w(szStatusText)); TRACE("(%p)->(%u %s)\n", This, ulStatusCode, debugstr_w(szStatusText));
switch(ulStatusCode) { switch(ulStatusCode) {
case BINDSTATUS_FINDINGRESOURCE: case BINDSTATUS_FINDINGRESOURCE:
@ -841,7 +841,7 @@ static HRESULT WINAPI InternetProtocolSink_ReportProgress(IInternetProtocolSink
case BINDSTATUS_CACHEFILENAMEAVAILABLE: case BINDSTATUS_CACHEFILENAMEAVAILABLE:
break; break;
default: default:
FIXME("Unhandled status code %ld\n", ulStatusCode); FIXME("Unhandled status code %d\n", ulStatusCode);
return E_NOTIMPL; return E_NOTIMPL;
}; };
@ -853,7 +853,7 @@ static HRESULT WINAPI InternetProtocolSink_ReportData(IInternetProtocolSink *ifa
{ {
Binding *This = PROTSINK_THIS(iface); Binding *This = PROTSINK_THIS(iface);
TRACE("(%p)->(%ld %lu %lu)\n", This, grfBSCF, ulProgress, ulProgressMax); TRACE("(%p)->(%d %u %u)\n", This, grfBSCF, ulProgress, ulProgressMax);
if(!This->verified_mime) { if(!This->verified_mime) {
LPWSTR mime; LPWSTR mime;
@ -891,7 +891,7 @@ static HRESULT WINAPI InternetProtocolSink_ReportResult(IInternetProtocolSink *i
{ {
Binding *This = PROTSINK_THIS(iface); Binding *This = PROTSINK_THIS(iface);
TRACE("(%p)->(%08lx %ld %s)\n", This, hrResult, dwError, debugstr_w(szResult)); TRACE("(%p)->(%08x %d %s)\n", This, hrResult, dwError, debugstr_w(szResult));
IInternetProtocol_Terminate(This->protocol, 0); IInternetProtocol_Terminate(This->protocol, 0);
return S_OK; return S_OK;
@ -955,7 +955,7 @@ static HRESULT WINAPI InternetBindInfo_GetBindString(IInternetBindInfo *iface,
{ {
Binding *This = BINDINF_THIS(iface); Binding *This = BINDINF_THIS(iface);
TRACE("(%p)->(%ld %p %ld %p)\n", This, ulStringType, ppwzStr, cEl, pcElFetched); TRACE("(%p)->(%d %p %d %p)\n", This, ulStringType, ppwzStr, cEl, pcElFetched);
switch(ulStringType) { switch(ulStringType) {
case BINDSTRING_ACCEPT_MIMES: { case BINDSTRING_ACCEPT_MIMES: {
@ -986,7 +986,7 @@ static HRESULT WINAPI InternetBindInfo_GetBindString(IInternetBindInfo *iface,
} }
} }
FIXME("not supported string type %ld\n", ulStringType); FIXME("not supported string type %d\n", ulStringType);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -1154,7 +1154,7 @@ static HRESULT Binding_Create(LPCWSTR url, IBindCtx *pbc, REFIID riid, Binding *
hres = IBindStatusCallback_GetBindInfo(ret->callback, &ret->bindf, &ret->bindinfo); hres = IBindStatusCallback_GetBindInfo(ret->callback, &ret->bindf, &ret->bindinfo);
if(FAILED(hres)) { if(FAILED(hres)) {
WARN("GetBindInfo failed: %08lx\n", hres); WARN("GetBindInfo failed: %08x\n", hres);
IBinding_Release(BINDING(ret)); IBinding_Release(BINDING(ret));
return hres; return hres;
} }
@ -1193,7 +1193,7 @@ HRESULT start_binding(LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv)
hres = IBindStatusCallback_OnStartBinding(binding->callback, 0, BINDING(binding)); hres = IBindStatusCallback_OnStartBinding(binding->callback, 0, BINDING(binding));
if(FAILED(hres)) { if(FAILED(hres)) {
WARN("OnStartBinding failed: %08lx\n", hres); WARN("OnStartBinding failed: %08x\n", hres);
IBindStatusCallback_OnStopBinding(binding->callback, 0x800c0008, NULL); IBindStatusCallback_OnStopBinding(binding->callback, 0x800c0008, NULL);
IBinding_Release(BINDING(binding)); IBinding_Release(BINDING(binding));
return hres; return hres;
@ -1203,7 +1203,7 @@ HRESULT start_binding(LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv)
BINDINF(binding), 0, 0); BINDINF(binding), 0, 0);
if(FAILED(hres)) { if(FAILED(hres)) {
WARN("Start failed: %08lx\n", hres); WARN("Start failed: %08x\n", hres);
IInternetProtocol_Terminate(binding->protocol, 0); IInternetProtocol_Terminate(binding->protocol, 0);
IBindStatusCallback_OnStopBinding(binding->callback, S_OK, NULL); IBindStatusCallback_OnStopBinding(binding->callback, S_OK, NULL);

18
dlls/urlmon/file.c
View file

@ -78,7 +78,7 @@ static ULONG WINAPI FileProtocol_AddRef(IInternetProtocol *iface)
{ {
FileProtocol *This = PROTOCOL_THIS(iface); FileProtocol *This = PROTOCOL_THIS(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%ld\n", This, ref); TRACE("(%p) ref=%d\n", This, ref);
return ref; return ref;
} }
@ -87,7 +87,7 @@ static ULONG WINAPI FileProtocol_Release(IInternetProtocol *iface)
FileProtocol *This = PROTOCOL_THIS(iface); FileProtocol *This = PROTOCOL_THIS(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%ld\n", This, ref); TRACE("(%p) ref=%d\n", This, ref);
if(!ref) { if(!ref) {
if(This->file) if(This->file)
@ -117,7 +117,7 @@ static HRESULT WINAPI FileProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl
static const WCHAR wszFile[] = {'f','i','l','e',':'}; static const WCHAR wszFile[] = {'f','i','l','e',':'};
TRACE("(%p)->(%s %p %p %08lx %ld)\n", This, debugstr_w(szUrl), pOIProtSink, TRACE("(%p)->(%s %p %p %08x %d)\n", This, debugstr_w(szUrl), pOIProtSink,
pOIBindInfo, grfPI, dwReserved); pOIBindInfo, grfPI, dwReserved);
memset(&bindinfo, 0, sizeof(bindinfo)); memset(&bindinfo, 0, sizeof(bindinfo));
@ -198,7 +198,7 @@ static HRESULT WINAPI FileProtocol_Abort(IInternetProtocol *iface, HRESULT hrRea
DWORD dwOptions) DWORD dwOptions)
{ {
FileProtocol *This = PROTOCOL_THIS(iface); FileProtocol *This = PROTOCOL_THIS(iface);
FIXME("(%p)->(%08lx %08lx)\n", This, hrReason, dwOptions); FIXME("(%p)->(%08x %08x)\n", This, hrReason, dwOptions);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -206,7 +206,7 @@ static HRESULT WINAPI FileProtocol_Terminate(IInternetProtocol *iface, DWORD dwO
{ {
FileProtocol *This = PROTOCOL_THIS(iface); FileProtocol *This = PROTOCOL_THIS(iface);
TRACE("(%p)->(%08lx)\n", This, dwOptions); TRACE("(%p)->(%08x)\n", This, dwOptions);
return S_OK; return S_OK;
} }
@ -231,7 +231,7 @@ static HRESULT WINAPI FileProtocol_Read(IInternetProtocol *iface, void *pv,
FileProtocol *This = PROTOCOL_THIS(iface); FileProtocol *This = PROTOCOL_THIS(iface);
DWORD read = 0; DWORD read = 0;
TRACE("(%p)->(%p %lu %p)\n", This, pv, cb, pcbRead); TRACE("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead);
if(!This->file) if(!This->file)
return INET_E_DATA_NOT_AVAILABLE; return INET_E_DATA_NOT_AVAILABLE;
@ -248,7 +248,7 @@ static HRESULT WINAPI FileProtocol_Seek(IInternetProtocol *iface, LARGE_INTEGER
DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition)
{ {
FileProtocol *This = PROTOCOL_THIS(iface); FileProtocol *This = PROTOCOL_THIS(iface);
FIXME("(%p)->(%ld %ld %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); FIXME("(%p)->(%d %d %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -256,7 +256,7 @@ static HRESULT WINAPI FileProtocol_LockRequest(IInternetProtocol *iface, DWORD d
{ {
FileProtocol *This = PROTOCOL_THIS(iface); FileProtocol *This = PROTOCOL_THIS(iface);
TRACE("(%p)->(%08lx)\n", This, dwOptions); TRACE("(%p)->(%08x)\n", This, dwOptions);
return S_OK; return S_OK;
} }
@ -313,7 +313,7 @@ static HRESULT WINAPI FilePriority_SetPriority(IInternetPriority *iface, LONG nP
{ {
FileProtocol *This = PRIORITY_THIS(iface); FileProtocol *This = PRIORITY_THIS(iface);
TRACE("(%p)->(%ld)\n", This, nPriority); TRACE("(%p)->(%d)\n", This, nPriority);
This->priority = nPriority; This->priority = nPriority;
return S_OK; return S_OK;

10
dlls/urlmon/format.c
View file

@ -66,7 +66,7 @@ static ULONG WINAPI EnumFORMATETC_AddRef(IEnumFORMATETC *iface)
{ {
ENUMF_THIS(iface); ENUMF_THIS(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%ld\n", This, ref); TRACE("(%p) ref=%d\n", This, ref);
return ref; return ref;
} }
@ -75,7 +75,7 @@ static ULONG WINAPI EnumFORMATETC_Release(IEnumFORMATETC *iface)
ENUMF_THIS(iface); ENUMF_THIS(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%ld\n", This, ref); TRACE("(%p) ref=%d\n", This, ref);
if(!ref) { if(!ref) {
HeapFree(GetProcessHeap(), 0, This->fetc); HeapFree(GetProcessHeap(), 0, This->fetc);
@ -93,7 +93,7 @@ static HRESULT WINAPI EnumFORMATETC_Next(IEnumFORMATETC *iface, ULONG celt,
ENUMF_THIS(iface); ENUMF_THIS(iface);
ULONG cnt; ULONG cnt;
TRACE("(%p)->(%ld %p %p)\n", This, celt, rgelt, pceltFetched); TRACE("(%p)->(%d %p %p)\n", This, celt, rgelt, pceltFetched);
if(!rgelt) if(!rgelt)
return E_INVALIDARG; return E_INVALIDARG;
@ -119,7 +119,7 @@ static HRESULT WINAPI EnumFORMATETC_Skip(IEnumFORMATETC *iface, ULONG celt)
{ {
ENUMF_THIS(iface); ENUMF_THIS(iface);
TRACE("(%p)->(%ld)\n", This, celt); TRACE("(%p)->(%d)\n", This, celt);
This->it += celt; This->it += celt;
return This->it > This->fetc_cnt ? S_FALSE : S_OK; return This->it > This->fetc_cnt ? S_FALSE : S_OK;
@ -197,7 +197,7 @@ HRESULT WINAPI CreateFormatEnumerator(UINT cfmtetc, FORMATETC *rgfmtetc,
*/ */
HRESULT WINAPI RegisterFormatEnumerator(LPBC pBC, IEnumFORMATETC *pEFetc, DWORD reserved) HRESULT WINAPI RegisterFormatEnumerator(LPBC pBC, IEnumFORMATETC *pEFetc, DWORD reserved)
{ {
TRACE("(%p %p %ld)\n", pBC, pEFetc, reserved); TRACE("(%p %p %d)\n", pBC, pEFetc, reserved);
if(reserved) if(reserved)
WARN("reserved != 0\n"); WARN("reserved != 0\n");

16
dlls/urlmon/ftp.c
View file

@ -69,7 +69,7 @@ static ULONG WINAPI FtpProtocol_AddRef(IInternetProtocol *iface)
{ {
FtpProtocol *This = PROTOCOL_THIS(iface); FtpProtocol *This = PROTOCOL_THIS(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%ld\n", This, ref); TRACE("(%p) ref=%d\n", This, ref);
return ref; return ref;
} }
@ -78,7 +78,7 @@ static ULONG WINAPI FtpProtocol_Release(IInternetProtocol *iface)
FtpProtocol *This = PROTOCOL_THIS(iface); FtpProtocol *This = PROTOCOL_THIS(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%ld\n", This, ref); TRACE("(%p) ref=%d\n", This, ref);
if(!ref) { if(!ref) {
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
@ -94,7 +94,7 @@ static HRESULT WINAPI FtpProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl,
DWORD grfPI, DWORD dwReserved) DWORD grfPI, DWORD dwReserved)
{ {
FtpProtocol *This = PROTOCOL_THIS(iface); FtpProtocol *This = PROTOCOL_THIS(iface);
FIXME("(%p)->(%s %p %p %08lx %ld)\n", This, debugstr_w(szUrl), pOIProtSink, FIXME("(%p)->(%s %p %p %08x %d)\n", This, debugstr_w(szUrl), pOIProtSink,
pOIBindInfo, grfPI, dwReserved); pOIBindInfo, grfPI, dwReserved);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -110,14 +110,14 @@ static HRESULT WINAPI FtpProtocol_Abort(IInternetProtocol *iface, HRESULT hrReas
DWORD dwOptions) DWORD dwOptions)
{ {
FtpProtocol *This = PROTOCOL_THIS(iface); FtpProtocol *This = PROTOCOL_THIS(iface);
FIXME("(%p)->(%08lx %08lx)\n", This, hrReason, dwOptions); FIXME("(%p)->(%08x %08x)\n", This, hrReason, dwOptions);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI FtpProtocol_Terminate(IInternetProtocol *iface, DWORD dwOptions) static HRESULT WINAPI FtpProtocol_Terminate(IInternetProtocol *iface, DWORD dwOptions)
{ {
FtpProtocol *This = PROTOCOL_THIS(iface); FtpProtocol *This = PROTOCOL_THIS(iface);
FIXME("(%p)->(%08lx)\n", This, dwOptions); FIXME("(%p)->(%08x)\n", This, dwOptions);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -139,7 +139,7 @@ static HRESULT WINAPI FtpProtocol_Read(IInternetProtocol *iface, void *pv,
ULONG cb, ULONG *pcbRead) ULONG cb, ULONG *pcbRead)
{ {
FtpProtocol *This = PROTOCOL_THIS(iface); FtpProtocol *This = PROTOCOL_THIS(iface);
FIXME("(%p)->(%p %lu %p)\n", This, pv, cb, pcbRead); FIXME("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -147,14 +147,14 @@ static HRESULT WINAPI FtpProtocol_Seek(IInternetProtocol *iface, LARGE_INTEGER d
DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition)
{ {
FtpProtocol *This = PROTOCOL_THIS(iface); FtpProtocol *This = PROTOCOL_THIS(iface);
FIXME("(%p)->(%ld %ld %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); FIXME("(%p)->(%d %d %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI FtpProtocol_LockRequest(IInternetProtocol *iface, DWORD dwOptions) static HRESULT WINAPI FtpProtocol_LockRequest(IInternetProtocol *iface, DWORD dwOptions)
{ {
FtpProtocol *This = PROTOCOL_THIS(iface); FtpProtocol *This = PROTOCOL_THIS(iface);
FIXME("(%p)->(%08lx)\n", This, dwOptions); FIXME("(%p)->(%08x)\n", This, dwOptions);
return E_NOTIMPL; return E_NOTIMPL;
} }

18
dlls/urlmon/http.c
View file

@ -77,7 +77,7 @@ static ULONG WINAPI HttpProtocol_AddRef(IInternetProtocol *iface)
{ {
HttpProtocol *This = PROTOCOL_THIS(iface); HttpProtocol *This = PROTOCOL_THIS(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%ld\n", This, ref); TRACE("(%p) ref=%d\n", This, ref);
return ref; return ref;
} }
@ -86,7 +86,7 @@ static ULONG WINAPI HttpProtocol_Release(IInternetProtocol *iface)
HttpProtocol *This = PROTOCOL_THIS(iface); HttpProtocol *This = PROTOCOL_THIS(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%ld\n", This, ref); TRACE("(%p) ref=%d\n", This, ref);
if(!ref) { if(!ref) {
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
@ -102,7 +102,7 @@ static HRESULT WINAPI HttpProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl
DWORD grfPI, DWORD dwReserved) DWORD grfPI, DWORD dwReserved)
{ {
HttpProtocol *This = PROTOCOL_THIS(iface); HttpProtocol *This = PROTOCOL_THIS(iface);
FIXME("(%p)->(%s %p %p %08lx %ld)\n", This, debugstr_w(szUrl), pOIProtSink, FIXME("(%p)->(%s %p %p %08x %d)\n", This, debugstr_w(szUrl), pOIProtSink,
pOIBindInfo, grfPI, dwReserved); pOIBindInfo, grfPI, dwReserved);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -118,14 +118,14 @@ static HRESULT WINAPI HttpProtocol_Abort(IInternetProtocol *iface, HRESULT hrRea
DWORD dwOptions) DWORD dwOptions)
{ {
HttpProtocol *This = PROTOCOL_THIS(iface); HttpProtocol *This = PROTOCOL_THIS(iface);
FIXME("(%p)->(%08lx %08lx)\n", This, hrReason, dwOptions); FIXME("(%p)->(%08x %08x)\n", This, hrReason, dwOptions);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HttpProtocol_Terminate(IInternetProtocol *iface, DWORD dwOptions) static HRESULT WINAPI HttpProtocol_Terminate(IInternetProtocol *iface, DWORD dwOptions)
{ {
HttpProtocol *This = PROTOCOL_THIS(iface); HttpProtocol *This = PROTOCOL_THIS(iface);
FIXME("(%p)->(%08lx)\n", This, dwOptions); FIXME("(%p)->(%08x)\n", This, dwOptions);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -147,7 +147,7 @@ static HRESULT WINAPI HttpProtocol_Read(IInternetProtocol *iface, void *pv,
ULONG cb, ULONG *pcbRead) ULONG cb, ULONG *pcbRead)
{ {
HttpProtocol *This = PROTOCOL_THIS(iface); HttpProtocol *This = PROTOCOL_THIS(iface);
FIXME("(%p)->(%p %lu %p)\n", This, pv, cb, pcbRead); FIXME("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -155,14 +155,14 @@ static HRESULT WINAPI HttpProtocol_Seek(IInternetProtocol *iface, LARGE_INTEGER
DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition)
{ {
HttpProtocol *This = PROTOCOL_THIS(iface); HttpProtocol *This = PROTOCOL_THIS(iface);
FIXME("(%p)->(%ld %ld %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); FIXME("(%p)->(%d %d %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HttpProtocol_LockRequest(IInternetProtocol *iface, DWORD dwOptions) static HRESULT WINAPI HttpProtocol_LockRequest(IInternetProtocol *iface, DWORD dwOptions)
{ {
HttpProtocol *This = PROTOCOL_THIS(iface); HttpProtocol *This = PROTOCOL_THIS(iface);
FIXME("(%p)->(%08lx)\n", This, dwOptions); FIXME("(%p)->(%08x)\n", This, dwOptions);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -199,7 +199,7 @@ static HRESULT WINAPI HttpPriority_SetPriority(IInternetPriority *iface, LONG nP
{ {
HttpProtocol *This = PRIORITY_THIS(iface); HttpProtocol *This = PRIORITY_THIS(iface);
TRACE("(%p)->(%ld)\n", This, nPriority); TRACE("(%p)->(%d)\n", This, nPriority);
This->priority = nPriority; This->priority = nPriority;
return S_OK; return S_OK;

16
dlls/urlmon/internet.c
View file

@ -39,7 +39,7 @@ static HRESULT parse_schema(LPCWSTR url, DWORD flags, LPWSTR result, DWORD size,
WCHAR *ptr; WCHAR *ptr;
DWORD len = 0; DWORD len = 0;
TRACE("(%s %08lx %p %ld %p)\n", debugstr_w(url), flags, result, size, rsize); TRACE("(%s %08x %p %d %p)\n", debugstr_w(url), flags, result, size, rsize);
if(flags) if(flags)
ERR("wrong flags\n"); ERR("wrong flags\n");
@ -68,7 +68,7 @@ static HRESULT parse_canonicalize_url(LPCWSTR url, DWORD flags, LPWSTR result,
DWORD prsize = size; DWORD prsize = size;
HRESULT hres; HRESULT hres;
TRACE("(%s %08lx %p %ld %p)\n", debugstr_w(url), flags, result, size, rsize); TRACE("(%s %08x %p %d %p)\n", debugstr_w(url), flags, result, size, rsize);
protocol_info = get_protocol_info(url); protocol_info = get_protocol_info(url);
@ -91,7 +91,7 @@ static HRESULT parse_security_url(LPCWSTR url, DWORD flags, LPWSTR result, DWORD
IInternetProtocolInfo *protocol_info; IInternetProtocolInfo *protocol_info;
HRESULT hres; HRESULT hres;
TRACE("(%s %08lx %p %ld %p)\n", debugstr_w(url), flags, result, size, rsize); TRACE("(%s %08x %p %d %p)\n", debugstr_w(url), flags, result, size, rsize);
protocol_info = get_protocol_info(url); protocol_info = get_protocol_info(url);
@ -110,7 +110,7 @@ static HRESULT parse_encode(LPCWSTR url, DWORD flags, LPWSTR result, DWORD size,
DWORD prsize; DWORD prsize;
HRESULT hres; HRESULT hres;
TRACE("(%s %08lx %p %ld %p)\n", debugstr_w(url), flags, result, size, rsize); TRACE("(%s %08x %p %d %p)\n", debugstr_w(url), flags, result, size, rsize);
protocol_info = get_protocol_info(url); protocol_info = get_protocol_info(url);
@ -136,7 +136,7 @@ static HRESULT parse_path_from_url(LPCWSTR url, DWORD flags, LPWSTR result, DWOR
DWORD prsize; DWORD prsize;
HRESULT hres; HRESULT hres;
TRACE("(%s %08lx %p %ld %p)\n", debugstr_w(url), flags, result, size, rsize); TRACE("(%s %08x %p %d %p)\n", debugstr_w(url), flags, result, size, rsize);
protocol_info = get_protocol_info(url); protocol_info = get_protocol_info(url);
@ -161,7 +161,7 @@ static HRESULT parse_security_domain(LPCWSTR url, DWORD flags, LPWSTR result,
IInternetProtocolInfo *protocol_info; IInternetProtocolInfo *protocol_info;
HRESULT hres; HRESULT hres;
TRACE("(%s %08lx %p %ld %p)\n", debugstr_w(url), flags, result, size, rsize); TRACE("(%s %08x %p %d %p)\n", debugstr_w(url), flags, result, size, rsize);
protocol_info = get_protocol_info(url); protocol_info = get_protocol_info(url);
@ -182,7 +182,7 @@ HRESULT WINAPI CoInternetParseUrl(LPCWSTR pwzUrl, PARSEACTION ParseAction, DWORD
LPWSTR pszResult, DWORD cchResult, DWORD *pcchResult, DWORD dwReserved) LPWSTR pszResult, DWORD cchResult, DWORD *pcchResult, DWORD dwReserved)
{ {
if(dwReserved) if(dwReserved)
WARN("dwReserved = %ld\n", dwReserved); WARN("dwReserved = %d\n", dwReserved);
switch(ParseAction) { switch(ParseAction) {
case PARSE_CANONICALIZE: case PARSE_CANONICALIZE:
@ -215,7 +215,7 @@ HRESULT WINAPI CoInternetCombineUrl(LPCWSTR pwzBaseUrl, LPCWSTR pwzRelativeUrl,
DWORD size = cchResult; DWORD size = cchResult;
HRESULT hres; HRESULT hres;
TRACE("(%s,%s,0x%08lx,%p,%ld,%p,%ld)\n", debugstr_w(pwzBaseUrl), TRACE("(%s,%s,0x%08x,%p,%d,%p,%d)\n", debugstr_w(pwzBaseUrl),
debugstr_w(pwzRelativeUrl), dwCombineFlags, pwzResult, cchResult, pcchResult, debugstr_w(pwzRelativeUrl), dwCombineFlags, pwzResult, cchResult, pcchResult,
dwReserved); dwReserved);

50
dlls/urlmon/sec_mgr.c
View file

@ -152,7 +152,7 @@ static ULONG WINAPI SecManagerImpl_AddRef(IInternetSecurityManager* iface)
SecManagerImpl *This = SECMGR_THIS(iface); SecManagerImpl *This = SECMGR_THIS(iface);
ULONG refCount = InterlockedIncrement(&This->ref); ULONG refCount = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%lu\n", This, refCount); TRACE("(%p) ref=%u\n", This, refCount);
return refCount; return refCount;
} }
@ -162,7 +162,7 @@ static ULONG WINAPI SecManagerImpl_Release(IInternetSecurityManager* iface)
SecManagerImpl *This = SECMGR_THIS(iface); SecManagerImpl *This = SECMGR_THIS(iface);
ULONG refCount = InterlockedDecrement(&This->ref); ULONG refCount = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%lu\n", This, refCount); TRACE("(%p) ref=%u\n", This, refCount);
/* destroy the object if there's no more reference on it */ /* destroy the object if there's no more reference on it */
if (!refCount){ if (!refCount){
@ -240,7 +240,7 @@ static HRESULT WINAPI SecManagerImpl_MapUrlToZone(IInternetSecurityManager *ifac
DWORD size; DWORD size;
HRESULT hres; HRESULT hres;
TRACE("(%p)->(%s %p %08lx)\n", iface, debugstr_w(pwszUrl), pdwZone, dwFlags); TRACE("(%p)->(%s %p %08x)\n", iface, debugstr_w(pwszUrl), pdwZone, dwFlags);
if(This->custom_manager) { if(This->custom_manager) {
hres = IInternetSecurityManager_MapUrlToZone(This->custom_manager, hres = IInternetSecurityManager_MapUrlToZone(This->custom_manager,
@ -253,7 +253,7 @@ static HRESULT WINAPI SecManagerImpl_MapUrlToZone(IInternetSecurityManager *ifac
return E_INVALIDARG; return E_INVALIDARG;
if(dwFlags) if(dwFlags)
FIXME("not supported flags: %08lx\n", dwFlags); FIXME("not supported flags: %08x\n", dwFlags);
size = (strlenW(pwszUrl)+16) * sizeof(WCHAR); size = (strlenW(pwszUrl)+16) * sizeof(WCHAR);
url = HeapAlloc(GetProcessHeap(), 0, size); url = HeapAlloc(GetProcessHeap(), 0, size);
@ -360,7 +360,7 @@ static HRESULT WINAPI SecManagerImpl_ProcessUrlAction(IInternetSecurityManager *
SecManagerImpl *This = SECMGR_THIS(iface); SecManagerImpl *This = SECMGR_THIS(iface);
HRESULT hres; HRESULT hres;
TRACE("(%p)->(%s %08lx %p %08lx %p %08lx %08lx %08lx)\n", iface, debugstr_w(pwszUrl), dwAction, TRACE("(%p)->(%s %08x %p %08x %p %08x %08x %08x)\n", iface, debugstr_w(pwszUrl), dwAction,
pPolicy, cbPolicy, pContext, cbContext, dwFlags, dwReserved); pPolicy, cbPolicy, pContext, cbContext, dwFlags, dwReserved);
if(This->custom_manager) { if(This->custom_manager) {
@ -384,7 +384,7 @@ static HRESULT WINAPI SecManagerImpl_QueryCustomPolicy(IInternetSecurityManager
SecManagerImpl *This = SECMGR_THIS(iface); SecManagerImpl *This = SECMGR_THIS(iface);
HRESULT hres; HRESULT hres;
TRACE("(%p)->(%s %s %p %p %p %08lx %08lx )\n", iface, debugstr_w(pwszUrl), debugstr_guid(guidKey), TRACE("(%p)->(%s %s %p %p %p %08x %08x )\n", iface, debugstr_w(pwszUrl), debugstr_guid(guidKey),
ppPolicy, pcbPolicy, pContext, cbContext, dwReserved); ppPolicy, pcbPolicy, pContext, cbContext, dwReserved);
if(This->custom_manager) { if(This->custom_manager) {
@ -404,7 +404,7 @@ static HRESULT WINAPI SecManagerImpl_SetZoneMapping(IInternetSecurityManager *if
SecManagerImpl *This = SECMGR_THIS(iface); SecManagerImpl *This = SECMGR_THIS(iface);
HRESULT hres; HRESULT hres;
TRACE("(%p)->(%08lx %s %08lx)\n", iface, dwZone, debugstr_w(pwszPattern),dwFlags); TRACE("(%p)->(%08x %s %08x)\n", iface, dwZone, debugstr_w(pwszPattern),dwFlags);
if(This->custom_manager) { if(This->custom_manager) {
hres = IInternetSecurityManager_SetZoneMapping(This->custom_manager, dwZone, hres = IInternetSecurityManager_SetZoneMapping(This->custom_manager, dwZone,
@ -423,7 +423,7 @@ static HRESULT WINAPI SecManagerImpl_GetZoneMappings(IInternetSecurityManager *i
SecManagerImpl *This = SECMGR_THIS(iface); SecManagerImpl *This = SECMGR_THIS(iface);
HRESULT hres; HRESULT hres;
TRACE("(%p)->(%08lx %p %08lx)\n", iface, dwZone, ppenumString,dwFlags); TRACE("(%p)->(%08x %p %08x)\n", iface, dwZone, ppenumString,dwFlags);
if(This->custom_manager) { if(This->custom_manager) {
hres = IInternetSecurityManager_GetZoneMappings(This->custom_manager, dwZone, hres = IInternetSecurityManager_GetZoneMappings(This->custom_manager, dwZone,
@ -553,7 +553,7 @@ static ULONG WINAPI ZoneMgrImpl_AddRef(IInternetZoneManager* iface)
ZoneMgrImpl* This = (ZoneMgrImpl*)iface; ZoneMgrImpl* This = (ZoneMgrImpl*)iface;
ULONG refCount = InterlockedIncrement(&This->ref); ULONG refCount = InterlockedIncrement(&This->ref);
TRACE("(%p)->(ref before=%lu)\n",This, refCount - 1); TRACE("(%p)->(ref before=%u)\n",This, refCount - 1);
return refCount; return refCount;
} }
@ -566,7 +566,7 @@ static ULONG WINAPI ZoneMgrImpl_Release(IInternetZoneManager* iface)
ZoneMgrImpl* This = (ZoneMgrImpl*)iface; ZoneMgrImpl* This = (ZoneMgrImpl*)iface;
ULONG refCount = InterlockedDecrement(&This->ref); ULONG refCount = InterlockedDecrement(&This->ref);
TRACE("(%p)->(ref before=%lu)\n",This, refCount + 1); TRACE("(%p)->(ref before=%u)\n",This, refCount + 1);
if(!refCount) { if(!refCount) {
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
@ -583,7 +583,7 @@ static HRESULT WINAPI ZoneMgrImpl_GetZoneAttributes(IInternetZoneManager* iface,
DWORD dwZone, DWORD dwZone,
ZONEATTRIBUTES* pZoneAttributes) ZONEATTRIBUTES* pZoneAttributes)
{ {
FIXME("(%p)->(%ld %p) stub\n", iface, dwZone, pZoneAttributes); FIXME("(%p)->(%d %p) stub\n", iface, dwZone, pZoneAttributes);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -594,7 +594,7 @@ static HRESULT WINAPI ZoneMgrImpl_SetZoneAttributes(IInternetZoneManager* iface,
DWORD dwZone, DWORD dwZone,
ZONEATTRIBUTES* pZoneAttributes) ZONEATTRIBUTES* pZoneAttributes)
{ {
FIXME("(%p)->(%08lx %p) stub\n", iface, dwZone, pZoneAttributes); FIXME("(%p)->(%08x %p) stub\n", iface, dwZone, pZoneAttributes);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -608,7 +608,7 @@ static HRESULT WINAPI ZoneMgrImpl_GetZoneCustomPolicy(IInternetZoneManager* ifac
DWORD* pcbPolicy, DWORD* pcbPolicy,
URLZONEREG ulrZoneReg) URLZONEREG ulrZoneReg)
{ {
FIXME("(%p)->(%08lx %s %p %p %08x) stub\n", iface, dwZone, debugstr_guid(guidKey), FIXME("(%p)->(%08x %s %p %p %08x) stub\n", iface, dwZone, debugstr_guid(guidKey),
ppPolicy, pcbPolicy, ulrZoneReg); ppPolicy, pcbPolicy, ulrZoneReg);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -623,7 +623,7 @@ static HRESULT WINAPI ZoneMgrImpl_SetZoneCustomPolicy(IInternetZoneManager* ifac
DWORD cbPolicy, DWORD cbPolicy,
URLZONEREG ulrZoneReg) URLZONEREG ulrZoneReg)
{ {
FIXME("(%p)->(%08lx %s %p %08lx %08x) stub\n", iface, dwZone, debugstr_guid(guidKey), FIXME("(%p)->(%08x %s %p %08x %08x) stub\n", iface, dwZone, debugstr_guid(guidKey),
ppPolicy, cbPolicy, ulrZoneReg); ppPolicy, cbPolicy, ulrZoneReg);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -642,7 +642,7 @@ static HRESULT WINAPI ZoneMgrImpl_GetZoneActionPolicy(IInternetZoneManager* ifac
static const WCHAR wszFormat[] = {'%','l','X',0}; static const WCHAR wszFormat[] = {'%','l','X',0};
TRACE("(%p)->(%ld %08lx %p %ld %d)\n", iface, dwZone, dwAction, pPolicy, TRACE("(%p)->(%d %08x %p %d %d)\n", iface, dwZone, dwAction, pPolicy,
cbPolicy, urlZoneReg); cbPolicy, urlZoneReg);
if(!pPolicy) if(!pPolicy)
@ -660,7 +660,7 @@ static HRESULT WINAPI ZoneMgrImpl_GetZoneActionPolicy(IInternetZoneManager* ifac
}else if(res == ERROR_FILE_NOT_FOUND) { }else if(res == ERROR_FILE_NOT_FOUND) {
hres = E_FAIL; hres = E_FAIL;
}else if(res != ERROR_SUCCESS) { }else if(res != ERROR_SUCCESS) {
ERR("RegQueryValue failed: %ld\n", res); ERR("RegQueryValue failed: %d\n", res);
hres = E_UNEXPECTED; hres = E_UNEXPECTED;
} }
@ -679,7 +679,7 @@ static HRESULT WINAPI ZoneMgrImpl_SetZoneActionPolicy(IInternetZoneManager* ifac
DWORD cbPolicy, DWORD cbPolicy,
URLZONEREG urlZoneReg) URLZONEREG urlZoneReg)
{ {
FIXME("(%p)->(%08lx %08lx %p %08lx %08x) stub\n", iface, dwZone, dwAction, pPolicy, FIXME("(%p)->(%08x %08x %p %08x %08x) stub\n", iface, dwZone, dwAction, pPolicy,
cbPolicy, urlZoneReg); cbPolicy, urlZoneReg);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -694,7 +694,7 @@ static HRESULT WINAPI ZoneMgrImpl_PromptAction(IInternetZoneManager* iface,
LPCWSTR pwszText, LPCWSTR pwszText,
DWORD dwPromptFlags) DWORD dwPromptFlags)
{ {
FIXME("%p %08lx %p %s %s %08lx\n", iface, dwAction, hwndParent, FIXME("%p %08x %p %s %s %08x\n", iface, dwAction, hwndParent,
debugstr_w(pwszUrl), debugstr_w(pwszText), dwPromptFlags ); debugstr_w(pwszUrl), debugstr_w(pwszText), dwPromptFlags );
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -708,7 +708,7 @@ static HRESULT WINAPI ZoneMgrImpl_LogAction(IInternetZoneManager* iface,
LPCWSTR pwszText, LPCWSTR pwszText,
DWORD dwLogFlags) DWORD dwLogFlags)
{ {
FIXME("(%p)->(%08lx %s %s %08lx) stub\n", iface, dwAction, debugstr_w(pwszUrl), FIXME("(%p)->(%08x %s %s %08x) stub\n", iface, dwAction, debugstr_w(pwszUrl),
debugstr_w(pwszText), dwLogFlags); debugstr_w(pwszText), dwLogFlags);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -721,7 +721,7 @@ static HRESULT WINAPI ZoneMgrImpl_CreateZoneEnumerator(IInternetZoneManager* ifa
DWORD* pdwCount, DWORD* pdwCount,
DWORD dwFlags) DWORD dwFlags)
{ {
FIXME("(%p)->(%p %p %08lx) stub\n", iface, pdwEnum, pdwCount, dwFlags); FIXME("(%p)->(%p %p %08x) stub\n", iface, pdwEnum, pdwCount, dwFlags);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -733,7 +733,7 @@ static HRESULT WINAPI ZoneMgrImpl_GetZoneAt(IInternetZoneManager* iface,
DWORD dwIndex, DWORD dwIndex,
DWORD* pdwZone) DWORD* pdwZone)
{ {
FIXME("(%p)->(%08lx %08lx %p) stub\n", iface, dwEnum, dwIndex, pdwZone); FIXME("(%p)->(%08x %08x %p) stub\n", iface, dwEnum, dwIndex, pdwZone);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -743,7 +743,7 @@ static HRESULT WINAPI ZoneMgrImpl_GetZoneAt(IInternetZoneManager* iface,
static HRESULT WINAPI ZoneMgrImpl_DestroyZoneEnumerator(IInternetZoneManager* iface, static HRESULT WINAPI ZoneMgrImpl_DestroyZoneEnumerator(IInternetZoneManager* iface,
DWORD dwEnum) DWORD dwEnum)
{ {
FIXME("(%p)->(%08lx) stub\n", iface, dwEnum); FIXME("(%p)->(%08x) stub\n", iface, dwEnum);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -755,7 +755,7 @@ static HRESULT WINAPI ZoneMgrImpl_CopyTemplatePoliciesToZone(IInternetZoneManage
DWORD dwZone, DWORD dwZone,
DWORD dwReserved) DWORD dwReserved)
{ {
FIXME("(%p)->(%08lx %08lx %08lx) stub\n", iface, dwTemplate, dwZone, dwReserved); FIXME("(%p)->(%08x %08x %08x) stub\n", iface, dwTemplate, dwZone, dwReserved);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -801,7 +801,7 @@ HRESULT ZoneMgrImpl_Construct(IUnknown *pUnkOuter, LPVOID *ppobj)
HRESULT WINAPI CoInternetCreateSecurityManager( IServiceProvider *pSP, HRESULT WINAPI CoInternetCreateSecurityManager( IServiceProvider *pSP,
IInternetSecurityManager **ppSM, DWORD dwReserved ) IInternetSecurityManager **ppSM, DWORD dwReserved )
{ {
TRACE("%p %p %ld\n", pSP, ppSM, dwReserved ); TRACE("%p %p %d\n", pSP, ppSM, dwReserved );
if(pSP) if(pSP)
FIXME("pSP not supported\n"); FIXME("pSP not supported\n");
@ -814,6 +814,6 @@ HRESULT WINAPI CoInternetCreateSecurityManager( IServiceProvider *pSP,
*/ */
HRESULT WINAPI CoInternetCreateZoneManager(IServiceProvider* pSP, IInternetZoneManager** ppZM, DWORD dwReserved) HRESULT WINAPI CoInternetCreateZoneManager(IServiceProvider* pSP, IInternetZoneManager** ppZM, DWORD dwReserved)
{ {
TRACE("(%p %p %lx)\n", pSP, ppZM, dwReserved); TRACE("(%p %p %x)\n", pSP, ppZM, dwReserved);
return ZoneMgrImpl_Construct(NULL, (void**)ppZM); return ZoneMgrImpl_Construct(NULL, (void**)ppZM);
} }

24
dlls/urlmon/session.c
View file

@ -82,13 +82,13 @@ static HRESULT get_protocol_iface(LPCWSTR schema, DWORD schema_len, IUnknown **r
res = RegQueryValueExW(hkey, wszCLSID, NULL, &type, (LPBYTE)str_clsid, &size); res = RegQueryValueExW(hkey, wszCLSID, NULL, &type, (LPBYTE)str_clsid, &size);
RegCloseKey(hkey); RegCloseKey(hkey);
if(res != ERROR_SUCCESS || type != REG_SZ) { if(res != ERROR_SUCCESS || type != REG_SZ) {
WARN("Could not get protocol CLSID res=%ld\n", res); WARN("Could not get protocol CLSID res=%d\n", res);
return E_FAIL; return E_FAIL;
} }
hres = CLSIDFromString(str_clsid, &clsid); hres = CLSIDFromString(str_clsid, &clsid);
if(FAILED(hres)) { if(FAILED(hres)) {
WARN("CLSIDFromString failed: %08lx\n", hres); WARN("CLSIDFromString failed: %08x\n", hres);
return hres; return hres;
} }
@ -194,13 +194,13 @@ static HRESULT WINAPI InternetSession_RegisterNameSpace(IInternetSession *iface,
name_space *new_name_space; name_space *new_name_space;
int size; int size;
TRACE("(%p %s %s %ld %p %ld)\n", pCF, debugstr_guid(rclsid), debugstr_w(pwzProtocol), TRACE("(%p %s %s %d %p %d)\n", pCF, debugstr_guid(rclsid), debugstr_w(pwzProtocol),
cPatterns, ppwzPatterns, dwReserved); cPatterns, ppwzPatterns, dwReserved);
if(cPatterns || ppwzPatterns) if(cPatterns || ppwzPatterns)
FIXME("patterns not supported\n"); FIXME("patterns not supported\n");
if(dwReserved) if(dwReserved)
WARN("dwReserved = %ld\n", dwReserved); WARN("dwReserved = %d\n", dwReserved);
if(!pCF || !pwzProtocol) if(!pCF || !pwzProtocol)
return E_INVALIDARG; return E_INVALIDARG;
@ -268,7 +268,7 @@ static HRESULT WINAPI InternetSession_CreateBinding(IInternetSession *iface,
LPBC pBC, LPCWSTR szUrl, IUnknown *pUnkOuter, IUnknown **ppUnk, LPBC pBC, LPCWSTR szUrl, IUnknown *pUnkOuter, IUnknown **ppUnk,
IInternetProtocol **ppOInetProt, DWORD dwOption) IInternetProtocol **ppOInetProt, DWORD dwOption)
{ {
FIXME("(%p %s %p %p %p %08lx)\n", pBC, debugstr_w(szUrl), pUnkOuter, ppUnk, FIXME("(%p %s %p %p %p %08x)\n", pBC, debugstr_w(szUrl), pUnkOuter, ppUnk,
ppOInetProt, dwOption); ppOInetProt, dwOption);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -276,7 +276,7 @@ static HRESULT WINAPI InternetSession_CreateBinding(IInternetSession *iface,
static HRESULT WINAPI InternetSession_SetSessionOption(IInternetSession *iface, static HRESULT WINAPI InternetSession_SetSessionOption(IInternetSession *iface,
DWORD dwOption, LPVOID pBuffer, DWORD dwBufferLength, DWORD dwReserved) DWORD dwOption, LPVOID pBuffer, DWORD dwBufferLength, DWORD dwReserved)
{ {
FIXME("(%08lx %p %ld %ld)\n", dwOption, pBuffer, dwBufferLength, dwReserved); FIXME("(%08x %p %d %d)\n", dwOption, pBuffer, dwBufferLength, dwReserved);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -313,12 +313,12 @@ static IInternetSession InternetSession = { &InternetSessionVtbl };
HRESULT WINAPI CoInternetGetSession(DWORD dwSessionMode, IInternetSession **ppIInternetSession, HRESULT WINAPI CoInternetGetSession(DWORD dwSessionMode, IInternetSession **ppIInternetSession,
DWORD dwReserved) DWORD dwReserved)
{ {
TRACE("(%ld %p %ld)\n", dwSessionMode, ppIInternetSession, dwReserved); TRACE("(%d %p %d)\n", dwSessionMode, ppIInternetSession, dwReserved);
if(dwSessionMode) if(dwSessionMode)
ERR("dwSessionMode=%ld\n", dwSessionMode); ERR("dwSessionMode=%d\n", dwSessionMode);
if(dwReserved) if(dwReserved)
ERR("dwReserved=%ld\n", dwReserved); ERR("dwReserved=%d\n", dwReserved);
*ppIInternetSession = &InternetSession; *ppIInternetSession = &InternetSession;
return S_OK; return S_OK;
@ -353,10 +353,10 @@ static BOOL get_url_encoding(HKEY root, DWORD *encoding)
HRESULT WINAPI UrlMkGetSessionOption(DWORD dwOption, LPVOID pBuffer, DWORD dwBufferLength, HRESULT WINAPI UrlMkGetSessionOption(DWORD dwOption, LPVOID pBuffer, DWORD dwBufferLength,
DWORD* pdwBufferLength, DWORD dwReserved) DWORD* pdwBufferLength, DWORD dwReserved)
{ {
TRACE("(%lx, %p, %ld, %p)\n", dwOption, pBuffer, dwBufferLength, pdwBufferLength); TRACE("(%x, %p, %d, %p)\n", dwOption, pBuffer, dwBufferLength, pdwBufferLength);
if(dwReserved) if(dwReserved)
WARN("dwReserved = %ld\n", dwReserved); WARN("dwReserved = %d\n", dwReserved);
switch(dwOption) { switch(dwOption) {
case URLMON_OPTION_URL_ENCODING: { case URLMON_OPTION_URL_ENCODING: {
@ -373,7 +373,7 @@ HRESULT WINAPI UrlMkGetSessionOption(DWORD dwOption, LPVOID pBuffer, DWORD dwBuf
return S_OK; return S_OK;
} }
default: default:
FIXME("unsupported option %lx\n", dwOption); FIXME("unsupported option %x\n", dwOption);
} }
return E_INVALIDARG; return E_INVALIDARG;

46
dlls/urlmon/umon.c
View file

@ -89,7 +89,7 @@ static ULONG WINAPI Binding_AddRef(IBinding* iface)
Binding *This = (Binding*)iface; Binding *This = (Binding*)iface;
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%ld\n", This, ref); TRACE("(%p) ref=%d\n", This, ref);
return ref; return ref;
} }
@ -99,7 +99,7 @@ static ULONG WINAPI Binding_Release(IBinding* iface)
Binding *This = (Binding*)iface; Binding *This = (Binding*)iface;
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%ld\n",This, ref); TRACE("(%p) ref=%d\n",This, ref);
if(!ref) { if(!ref) {
HeapFree(GetProcessHeap(), 0, This->URLName); HeapFree(GetProcessHeap(), 0, This->URLName);
@ -161,7 +161,7 @@ static HRESULT WINAPI Binding_SetPriority(IBinding* iface, LONG nPriority)
{ {
Binding *This = (Binding*)iface; Binding *This = (Binding*)iface;
FIXME("(%p)->(%ld): stub\n", This, nPriority); FIXME("(%p)->(%d): stub\n", This, nPriority);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -340,7 +340,7 @@ static ULONG WINAPI URLMonikerImpl_AddRef(IMoniker* iface)
URLMonikerImpl *This = (URLMonikerImpl *)iface; URLMonikerImpl *This = (URLMonikerImpl *)iface;
ULONG refCount = InterlockedIncrement(&This->ref); ULONG refCount = InterlockedIncrement(&This->ref);
TRACE("(%p)->(ref before=%lu)\n",This, refCount - 1); TRACE("(%p)->(ref before=%u)\n",This, refCount - 1);
return refCount; return refCount;
} }
@ -353,7 +353,7 @@ static ULONG WINAPI URLMonikerImpl_Release(IMoniker* iface)
URLMonikerImpl *This = (URLMonikerImpl *)iface; URLMonikerImpl *This = (URLMonikerImpl *)iface;
ULONG refCount = InterlockedDecrement(&This->ref); ULONG refCount = InterlockedDecrement(&This->ref);
TRACE("(%p)->(ref before=%lu)\n",This, refCount + 1); TRACE("(%p)->(ref before=%u)\n",This, refCount + 1);
/* destroy the object if there's no more reference on it */ /* destroy the object if there's no more reference on it */
if (!refCount) { if (!refCount) {
@ -558,10 +558,10 @@ static HRESULT URLMonikerImpl_BindToStorage_hack(LPCWSTR URLName,
DWORD dwService = 0; DWORD dwService = 0;
BOOL bSuccess; BOOL bSuccess;
TRACE("got bindinfo. bindf = %08lx extrainfo = %s bindinfof = %08lx bindverb = %08lx iid %s\n", TRACE("got bindinfo. bindf = %08x extrainfo = %s bindinfof = %08x bindverb = %08x iid %s\n",
bindf, debugstr_w(bi.szExtraInfo), bi.grfBindInfoF, bi.dwBindVerb, debugstr_guid(&bi.iid)); bindf, debugstr_w(bi.szExtraInfo), bi.grfBindInfoF, bi.dwBindVerb, debugstr_guid(&bi.iid));
hres = IBindStatusCallback_OnStartBinding(bind->pbscb, 0, (IBinding*)bind); hres = IBindStatusCallback_OnStartBinding(bind->pbscb, 0, (IBinding*)bind);
TRACE("OnStartBinding rets %08lx\n", hres); TRACE("OnStartBinding rets %08x\n", hres);
/* This class will accept URLs with the backslash in them. But InternetCrackURL will not - it /* This class will accept URLs with the backslash in them. But InternetCrackURL will not - it
* requires forward slashes (this is the behaviour of Microsoft's INETAPI). So we need to make * requires forward slashes (this is the behaviour of Microsoft's INETAPI). So we need to make
@ -712,7 +712,7 @@ static HRESULT URLMonikerImpl_BindToStorage_hack(LPCWSTR URLName,
} }
if(bSuccess) if(bSuccess)
{ {
TRACE("res = %ld gle = %08lx url len = %ld\n", hres, GetLastError(), bind->expected_size); TRACE("res = %d gle = %08x url len = %d\n", hres, GetLastError(), bind->expected_size);
IBindStatusCallback_OnProgress(bind->pbscb, 0, 0, BINDSTATUS_CACHEFILENAMEAVAILABLE, szFileName); IBindStatusCallback_OnProgress(bind->pbscb, 0, 0, BINDSTATUS_CACHEFILENAMEAVAILABLE, szFileName);
@ -720,7 +720,7 @@ static HRESULT URLMonikerImpl_BindToStorage_hack(LPCWSTR URLName,
char buf[4096]; char buf[4096];
DWORD bufread; DWORD bufread;
if(InternetReadFile(bind->hrequest, buf, sizeof(buf), &bufread)) { if(InternetReadFile(bind->hrequest, buf, sizeof(buf), &bufread)) {
TRACE("read %ld bytes %s...\n", bufread, debugstr_an(buf, 10)); TRACE("read %d bytes %s...\n", bufread, debugstr_an(buf, 10));
if(bufread == 0) break; if(bufread == 0) break;
hres = Binding_MoreCacheData(bind, buf, bufread); hres = Binding_MoreCacheData(bind, buf, bufread);
} else } else
@ -766,7 +766,7 @@ static HRESULT WINAPI URLMonikerImpl_BindToStorage(IMoniker* iface,
bret = InternetCrackUrlW(This->URLName, 0, ICU_ESCAPE, &url); bret = InternetCrackUrlW(This->URLName, 0, ICU_ESCAPE, &url);
if(!bret) { if(!bret) {
ERR("InternetCrackUrl failed: %ld\n", GetLastError()); ERR("InternetCrackUrl failed: %d\n", GetLastError());
return E_FAIL; return E_FAIL;
} }
@ -792,7 +792,7 @@ static HRESULT WINAPI URLMonikerImpl_Reduce(IMoniker* iface,
{ {
URLMonikerImpl *This = (URLMonikerImpl *)iface; URLMonikerImpl *This = (URLMonikerImpl *)iface;
TRACE("(%p,%p,%ld,%p,%p)\n",This,pbc,dwReduceHowFar,ppmkToLeft,ppmkReduced); TRACE("(%p,%p,%d,%p,%p)\n",This,pbc,dwReduceHowFar,ppmkToLeft,ppmkReduced);
if(!ppmkReduced) if(!ppmkReduced)
return E_INVALIDARG; return E_INVALIDARG;
@ -1097,7 +1097,7 @@ static HRESULT URLMonikerImpl_Construct(URLMonikerImpl* This, LPCOLESTR lpszLeft
HRESULT WINAPI CreateAsyncBindCtx(DWORD reserved, IBindStatusCallback *callback, HRESULT WINAPI CreateAsyncBindCtx(DWORD reserved, IBindStatusCallback *callback,
IEnumFORMATETC *format, IBindCtx **pbind) IEnumFORMATETC *format, IBindCtx **pbind)
{ {
TRACE("(%08lx %p %p %p)\n", reserved, callback, format, pbind); TRACE("(%08x %p %p %p)\n", reserved, callback, format, pbind);
if(!callback) if(!callback)
return E_INVALIDARG; return E_INVALIDARG;
@ -1117,18 +1117,18 @@ HRESULT WINAPI CreateAsyncBindCtxEx(IBindCtx *ibind, DWORD options,
BIND_OPTS bindopts; BIND_OPTS bindopts;
IBindCtx *bctx; IBindCtx *bctx;
TRACE("(%p %08lx %p %p %p %ld)\n", ibind, options, callback, format, pbind, reserved); TRACE("(%p %08x %p %p %p %d)\n", ibind, options, callback, format, pbind, reserved);
if(!pbind) if(!pbind)
return E_INVALIDARG; return E_INVALIDARG;
if(options) if(options)
FIXME("not supported options %08lx\n", options); FIXME("not supported options %08x\n", options);
if(format) if(format)
FIXME("format is not supported\n"); FIXME("format is not supported\n");
if(reserved) if(reserved)
WARN("reserved=%ld\n", reserved); WARN("reserved=%d\n", reserved);
hres = CreateBindCtx(0, &bctx); hres = CreateBindCtx(0, &bctx);
if(FAILED(hres)) if(FAILED(hres))
@ -1211,7 +1211,7 @@ HRESULT WINAPI CoInternetQueryInfo(LPCWSTR pwzUrl, QUERYOPTION QueryOption,
DWORD dwQueryFlags, LPVOID pvBuffer, DWORD cbBuffer, DWORD * pcbBuffer, DWORD dwQueryFlags, LPVOID pvBuffer, DWORD cbBuffer, DWORD * pcbBuffer,
DWORD dwReserved) DWORD dwReserved)
{ {
FIXME("(%s, %x, %lx, %p, %lx, %p, %lx): stub\n", debugstr_w(pwzUrl), FIXME("(%s, %x, %x, %p, %x, %p, %x): stub\n", debugstr_w(pwzUrl),
QueryOption, dwQueryFlags, pvBuffer, cbBuffer, pcbBuffer, dwReserved); QueryOption, dwQueryFlags, pvBuffer, cbBuffer, pcbBuffer, dwReserved);
return S_OK; return S_OK;
} }
@ -1293,7 +1293,7 @@ HRESULT WINAPI RegisterBindStatusCallback(
{ {
IBindStatusCallback *prev; IBindStatusCallback *prev;
TRACE("(%p,%p,%p,%lu)\n", pbc, pbsc, ppbscPrevious, dwReserved); TRACE("(%p,%p,%p,%u)\n", pbc, pbsc, ppbscPrevious, dwReserved);
if (pbc == NULL || pbsc == NULL) if (pbc == NULL || pbsc == NULL)
return E_INVALIDARG; return E_INVALIDARG;
@ -1374,7 +1374,7 @@ HRESULT WINAPI URLDownloadToFileA(LPUNKNOWN pCaller,
UNICODE_STRING szURL_w, szFileName_w; UNICODE_STRING szURL_w, szFileName_w;
if ((szURL == NULL) || (szFileName == NULL)) { if ((szURL == NULL) || (szFileName == NULL)) {
FIXME("(%p,%s,%s,%08lx,%p) cannot accept NULL strings !\n", pCaller, debugstr_a(szURL), debugstr_a(szFileName), dwReserved, lpfnCB); FIXME("(%p,%s,%s,%08x,%p) cannot accept NULL strings !\n", pCaller, debugstr_a(szURL), debugstr_a(szFileName), dwReserved, lpfnCB);
return E_INVALIDARG; /* The error code is not specified in this case... */ return E_INVALIDARG; /* The error code is not specified in this case... */
} }
@ -1391,7 +1391,7 @@ HRESULT WINAPI URLDownloadToFileA(LPUNKNOWN pCaller,
} }
} }
FIXME("(%p,%s,%s,%08lx,%p) could not allocate W strings !\n", pCaller, szURL, szFileName, dwReserved, lpfnCB); FIXME("(%p,%s,%s,%08x,%p) could not allocate W strings !\n", pCaller, szURL, szFileName, dwReserved, lpfnCB);
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
} }
@ -1429,7 +1429,7 @@ HRESULT WINAPI URLDownloadToFileW(LPUNKNOWN pCaller,
static const WCHAR wszAppName[]={'u','r','l','m','o','n','.','d','l','l',0}; static const WCHAR wszAppName[]={'u','r','l','m','o','n','.','d','l','l',0};
/* Note: all error codes would need to be checked agains real Windows behaviour... */ /* Note: all error codes would need to be checked agains real Windows behaviour... */
TRACE("(%p,%s,%s,%08lx,%p) stub!\n", pCaller, debugstr_w(szURL), debugstr_w(szFileName), dwReserved, lpfnCB); TRACE("(%p,%s,%s,%08x,%p) stub!\n", pCaller, debugstr_w(szURL), debugstr_w(szFileName), dwReserved, lpfnCB);
if ((szURL == NULL) || (szFileName == NULL)) { if ((szURL == NULL) || (szFileName == NULL)) {
FIXME(" cannot accept NULL strings !\n"); FIXME(" cannot accept NULL strings !\n");
@ -1485,7 +1485,7 @@ HRESULT WINAPI URLDownloadToFileW(LPUNKNOWN pCaller,
if (HttpQueryInfoW(hreq, HTTP_QUERY_CONTENT_LENGTH | HTTP_QUERY_FLAG_NUMBER, if (HttpQueryInfoW(hreq, HTTP_QUERY_CONTENT_LENGTH | HTTP_QUERY_FLAG_NUMBER,
&total_size, &arg_size, NULL)) { &total_size, &arg_size, NULL)) {
TRACE(" total size : %ld\n", total_size); TRACE(" total size : %d\n", total_size);
} }
hfile = CreateFileW(szFileName, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, hfile = CreateFileW(szFileName, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS,
@ -1572,7 +1572,7 @@ HRESULT WINAPI URLDownloadToCacheFileA(LPUNKNOWN lpUnkCaller, LPCSTR szURL, LPST
int len; int len;
HRESULT hres; HRESULT hres;
TRACE("(%p %s %p %ld %ld %p)\n", lpUnkCaller, debugstr_a(szURL), szFileName, TRACE("(%p %s %p %d %d %p)\n", lpUnkCaller, debugstr_a(szURL), szFileName,
dwBufLength, dwReserved, pBSC); dwBufLength, dwReserved, pBSC);
if(szURL) { if(szURL) {
@ -1612,7 +1612,7 @@ HRESULT WINAPI URLDownloadToCacheFileW(LPUNKNOWN lpUnkCaller, LPCWSTR szURL, LPW
'O','K','\\','r','\\','n','\\','r','\\','n',0 'O','K','\\','r','\\','n','\\','r','\\','n',0
}; };
TRACE("(%p, %s, %p, %ld, %ld, %p)\n", lpUnkCaller, debugstr_w(szURL), TRACE("(%p, %s, %p, %d, %d, %p)\n", lpUnkCaller, debugstr_w(szURL),
szFileName, dwBufLength, dwReserved, pBSC); szFileName, dwBufLength, dwReserved, pBSC);
if (!szURL || !szFileName) if (!szURL || !szFileName)

6
dlls/urlmon/umstream.c
View file

@ -193,7 +193,7 @@ static ULONG WINAPI IStream_fnAddRef(IStream *iface)
IUMCacheStream *This = (IUMCacheStream *)iface; IUMCacheStream *This = (IUMCacheStream *)iface;
ULONG refCount = InterlockedIncrement(&This->ref); ULONG refCount = InterlockedIncrement(&This->ref);
TRACE("(%p)->(count=%lu)\n", This, refCount - 1); TRACE("(%p)->(count=%u)\n", This, refCount - 1);
return refCount; return refCount;
} }
@ -206,7 +206,7 @@ static ULONG WINAPI IStream_fnRelease(IStream *iface)
IUMCacheStream *This = (IUMCacheStream *)iface; IUMCacheStream *This = (IUMCacheStream *)iface;
ULONG refCount = InterlockedDecrement(&This->ref); ULONG refCount = InterlockedDecrement(&This->ref);
TRACE("(%p)->(count=%lu)\n", This, refCount + 1); TRACE("(%p)->(count=%u)\n", This, refCount + 1);
if (!refCount) if (!refCount)
{ {
@ -228,7 +228,7 @@ static HRESULT WINAPI IStream_fnRead (IStream * iface,
ULONG dwBytesRead; ULONG dwBytesRead;
IUMCacheStream *This = (IUMCacheStream *)iface; IUMCacheStream *This = (IUMCacheStream *)iface;
TRACE("(%p)->(%p,0x%08lx,%p)\n",This, pv, cb, pcbRead); TRACE("(%p)->(%p,0x%08x,%p)\n",This, pv, cb, pcbRead);
if ( !pv ) if ( !pv )
return STG_E_INVALIDPOINTER; return STG_E_INVALIDPOINTER;

22
dlls/urlmon/urlmon_main.c
View file

@ -52,7 +52,7 @@ static void init_session(BOOL);
*/ */
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
{ {
TRACE("%p 0x%lx %p\n", hinstDLL, fdwReason, fImpLoad); TRACE("%p 0x%x %p\n", hinstDLL, fdwReason, fImpLoad);
switch(fdwReason) { switch(fdwReason) {
case DLL_PROCESS_ATTACH: case DLL_PROCESS_ATTACH:
@ -282,7 +282,7 @@ HRESULT WINAPI DllRegisterServerEx(void)
HRESULT WINAPI UrlMkSetSessionOption(DWORD dwOption, LPVOID pBuffer, DWORD dwBufferLength, HRESULT WINAPI UrlMkSetSessionOption(DWORD dwOption, LPVOID pBuffer, DWORD dwBufferLength,
DWORD Reserved) DWORD Reserved)
{ {
FIXME("(%#lx, %p, %#lx): stub\n", dwOption, pBuffer, dwBufferLength); FIXME("(%#x, %p, %#x): stub\n", dwOption, pBuffer, dwBufferLength);
return S_OK; return S_OK;
} }
@ -294,10 +294,10 @@ static const CHAR Agent[] = "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.0)"
*/ */
HRESULT WINAPI ObtainUserAgentString(DWORD dwOption, LPSTR pcszUAOut, DWORD *cbSize) HRESULT WINAPI ObtainUserAgentString(DWORD dwOption, LPSTR pcszUAOut, DWORD *cbSize)
{ {
FIXME("(%ld, %p, %p): stub\n", dwOption, pcszUAOut, cbSize); FIXME("(%d, %p, %p): stub\n", dwOption, pcszUAOut, cbSize);
if(dwOption) { if(dwOption) {
ERR("dwOption: %ld, must be zero\n", dwOption); ERR("dwOption: %d, must be zero\n", dwOption);
} }
if (sizeof(Agent) < *cbSize) if (sizeof(Agent) < *cbSize)
@ -309,7 +309,7 @@ HRESULT WINAPI ObtainUserAgentString(DWORD dwOption, LPSTR pcszUAOut, DWORD *cbS
HRESULT WINAPI CoInternetCompareUrl(LPCWSTR pwzUrl1, LPCWSTR pwzUrl2, DWORD dwCompareFlags) HRESULT WINAPI CoInternetCompareUrl(LPCWSTR pwzUrl1, LPCWSTR pwzUrl2, DWORD dwCompareFlags)
{ {
TRACE("(%s,%s,%08lx)\n", debugstr_w(pwzUrl1), debugstr_w(pwzUrl2), dwCompareFlags); TRACE("(%s,%s,%08x)\n", debugstr_w(pwzUrl1), debugstr_w(pwzUrl2), dwCompareFlags);
return UrlCompareW(pwzUrl1, pwzUrl2, dwCompareFlags)==0?S_OK:S_FALSE; return UrlCompareW(pwzUrl1, pwzUrl2, dwCompareFlags)==0?S_OK:S_FALSE;
} }
@ -333,7 +333,7 @@ HRESULT WINAPI CoInternetCompareUrl(LPCWSTR pwzUrl1, LPCWSTR pwzUrl2, DWORD dwCo
*/ */
HRESULT WINAPI IsValidURL(LPBC pBC, LPCWSTR szURL, DWORD dwReserved) HRESULT WINAPI IsValidURL(LPBC pBC, LPCWSTR szURL, DWORD dwReserved)
{ {
FIXME("(%p, %s, %ld): stub\n", pBC, debugstr_w(szURL), dwReserved); FIXME("(%p, %s, %d): stub\n", pBC, debugstr_w(szURL), dwReserved);
if (pBC != NULL || dwReserved != 0) if (pBC != NULL || dwReserved != 0)
return E_INVALIDARG; return E_INVALIDARG;
@ -349,7 +349,7 @@ HRESULT WINAPI IsValidURL(LPBC pBC, LPCWSTR szURL, DWORD dwReserved)
HRESULT WINAPI FaultInIEFeature( HWND hwnd, uCLSSPEC * pClassSpec, HRESULT WINAPI FaultInIEFeature( HWND hwnd, uCLSSPEC * pClassSpec,
QUERYCONTEXT *pQuery, DWORD flags ) QUERYCONTEXT *pQuery, DWORD flags )
{ {
FIXME("%p %p %p %08lx\n", hwnd, pClassSpec, pQuery, flags); FIXME("%p %p %p %08x\n", hwnd, pClassSpec, pQuery, flags);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -361,7 +361,7 @@ HRESULT WINAPI CoGetClassObjectFromURL( REFCLSID rclsid, LPCWSTR szCodeURL, DWOR
LPBINDCTX pBindCtx, DWORD dwClsContext, LPVOID pvReserved, LPBINDCTX pBindCtx, DWORD dwClsContext, LPVOID pvReserved,
REFIID riid, LPVOID *ppv ) REFIID riid, LPVOID *ppv )
{ {
FIXME("(%s %s %ld %ld %s %p %ld %p %s %p) Stub!\n", debugstr_guid(rclsid), debugstr_w(szCodeURL), FIXME("(%s %s %d %d %s %p %d %p %s %p) Stub!\n", debugstr_guid(rclsid), debugstr_w(szCodeURL),
dwFileVersionMS, dwFileVersionLS, debugstr_w(szContentType), pBindCtx, dwClsContext, pvReserved, dwFileVersionMS, dwFileVersionLS, debugstr_w(szContentType), pBindCtx, dwClsContext, pvReserved,
debugstr_guid(riid), ppv); debugstr_guid(riid), ppv);
return E_NOINTERFACE; return E_NOINTERFACE;
@ -479,13 +479,13 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC, LPCWSTR pwzUrl, LPVOID pBuffer,
DWORD cbSize, LPCWSTR pwzMimeProposed, DWORD dwMimeFlags, DWORD cbSize, LPCWSTR pwzMimeProposed, DWORD dwMimeFlags,
LPWSTR* ppwzMimeOut, DWORD dwReserved) LPWSTR* ppwzMimeOut, DWORD dwReserved)
{ {
TRACE("(%p,%s,%p,%ld,%s,0x%lx,%p,0x%lx)\n", pBC, debugstr_w(pwzUrl), pBuffer, cbSize, TRACE("(%p,%s,%p,%d,%s,0x%x,%p,0x%x)\n", pBC, debugstr_w(pwzUrl), pBuffer, cbSize,
debugstr_w(pwzMimeProposed), dwMimeFlags, ppwzMimeOut, dwReserved); debugstr_w(pwzMimeProposed), dwMimeFlags, ppwzMimeOut, dwReserved);
if(dwMimeFlags) if(dwMimeFlags)
WARN("dwMimeFlags=%08lx\n", dwMimeFlags); WARN("dwMimeFlags=%08x\n", dwMimeFlags);
if(dwReserved) if(dwReserved)
WARN("dwReserved=%ld\n", dwReserved); WARN("dwReserved=%d\n", dwReserved);
/* pBC seams to not be used */ /* pBC seams to not be used */