Module: wine Branch: master Commit: 097fc377e2885a9f3512b513eea4d6dbcb86734a URL: https://source.winehq.org/git/wine.git/?a=commit;h=097fc377e2885a9f3512b513e...
Author: Eric Pouech eric.pouech@gmail.com Date: Fri Feb 11 08:40:59 2022 +0100
itss: Enable compilation with long types.
Signed-off-by: Eric Pouech eric.pouech@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/itss/Makefile.in | 1 - dlls/itss/itss.c | 6 +++--- dlls/itss/protocol.c | 30 +++++++++++++++--------------- dlls/itss/storage.c | 16 ++++++++-------- 4 files changed, 26 insertions(+), 27 deletions(-)
diff --git a/dlls/itss/Makefile.in b/dlls/itss/Makefile.in index c12ead3faec..2d34b74ed78 100644 --- a/dlls/itss/Makefile.in +++ b/dlls/itss/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = itss.dll IMPORTS = uuid urlmon shlwapi ole32
diff --git a/dlls/itss/itss.c b/dlls/itss/itss.c index 6d41ef38c38..010c01dd586 100644 --- a/dlls/itss/itss.c +++ b/dlls/itss/itss.c @@ -231,7 +231,7 @@ static HRESULT WINAPI ITStorageImpl_StgCreateDocfile( { ITStorageImpl *This = impl_from_IITStorage(iface);
- TRACE("%p %s %u %u %p\n", This, + TRACE("%p %s %lu %lu %p\n", This, debugstr_w(pwcsName), grfMode, reserved, ppstgOpen );
return ITSS_StgOpenStorage( pwcsName, NULL, grfMode, @@ -279,7 +279,7 @@ static HRESULT WINAPI ITStorageImpl_StgOpenStorage( { ITStorageImpl *This = impl_from_IITStorage(iface);
- TRACE("%p %s %p %d %p\n", This, debugstr_w( pwcsName ), + TRACE("%p %s %p %ld %p\n", This, debugstr_w( pwcsName ), pstgPriority, grfMode, snbExclude );
return ITSS_StgOpenStorage( pwcsName, pstgPriority, grfMode, @@ -379,6 +379,6 @@ static HRESULT ITSS_create(IUnknown *pUnkOuter, LPVOID *ppObj)
HRESULT WINAPI DllCanUnloadNow(void) { - TRACE("dll_count = %u\n", dll_count); + TRACE("dll_count = %lu\n", dll_count); return dll_count ? S_FALSE : S_OK; } diff --git a/dlls/itss/protocol.c b/dlls/itss/protocol.c index 6d40ddf738f..cb1df3c2e1a 100644 --- a/dlls/itss/protocol.c +++ b/dlls/itss/protocol.c @@ -101,7 +101,7 @@ static ULONG WINAPI ITSProtocol_AddRef(IUnknown *iface) { ITSProtocol *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; }
@@ -110,7 +110,7 @@ static ULONG WINAPI ITSProtocol_Release(IUnknown *iface) ITSProtocol *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) { release_chm(This); @@ -231,7 +231,7 @@ static HRESULT WINAPI ITSProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, int res; 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);
ptr = skip_schema(szUrl); @@ -242,7 +242,7 @@ static HRESULT WINAPI ITSProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, 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; }
@@ -253,7 +253,7 @@ static HRESULT WINAPI ITSProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, memcpy(file_name, ptr, len*sizeof(WCHAR)); hres = UrlUnescapeW(file_name, NULL, &len, URL_UNESCAPE_INPLACE); if(FAILED(hres)) { - WARN("UrlUnescape failed: %08x\n", hres); + WARN("UrlUnescape failed: %08lx\n", hres); HeapFree(GetProcessHeap(), 0, file_name); return hres; } @@ -322,7 +322,7 @@ static HRESULT WINAPI ITSProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, BSCF_FIRSTDATANOTIFICATION|BSCF_DATAFULLYAVAILABLE, chm_object.length, chm_object.length); if(FAILED(hres)) { - WARN("ReportData failed: %08x\n", hres); + WARN("ReportData failed: %08lx\n", hres); release_chm(This); return report_result(pOIProtSink, hres); } @@ -343,7 +343,7 @@ static HRESULT WINAPI ITSProtocol_Abort(IInternetProtocol *iface, HRESULT hrReas DWORD dwOptions) { ITSProtocol *This = impl_from_IInternetProtocol(iface); - FIXME("(%p)->(%08x %08x)\n", This, hrReason, dwOptions); + FIXME("(%p)->(%08lx %08lx)\n", This, hrReason, dwOptions); return E_NOTIMPL; }
@@ -351,7 +351,7 @@ static HRESULT WINAPI ITSProtocol_Terminate(IInternetProtocol *iface, DWORD dwOp { ITSProtocol *This = impl_from_IInternetProtocol(iface);
- TRACE("(%p)->(%08x)\n", This, dwOptions); + TRACE("(%p)->(%08lx)\n", This, dwOptions);
return S_OK; } @@ -375,7 +375,7 @@ static HRESULT WINAPI ITSProtocol_Read(IInternetProtocol *iface, void *pv, { ITSProtocol *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);
if(!This->chm_file) return INET_E_DATA_NOT_AVAILABLE; @@ -390,7 +390,7 @@ static HRESULT WINAPI ITSProtocol_Seek(IInternetProtocol *iface, LARGE_INTEGER d DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) { ITSProtocol *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; }
@@ -398,7 +398,7 @@ static HRESULT WINAPI ITSProtocol_LockRequest(IInternetProtocol *iface, DWORD dw { ITSProtocol *This = impl_from_IInternetProtocol(iface);
- TRACE("(%p)->(%08x)\n", This, dwOptions); + TRACE("(%p)->(%08lx)\n", This, dwOptions);
return S_OK; } @@ -453,7 +453,7 @@ static HRESULT WINAPI ITSProtocolInfo_ParseUrl(IInternetProtocolInfo *iface, LPC { ITSProtocol *This = impl_from_IInternetProtocolInfo(iface);
- TRACE("(%p)->(%s %x %08x %p %d %p %d)\n", This, debugstr_w(pwzUrl), ParseAction, + TRACE("(%p)->(%s %x %08lx %p %ld %p %ld)\n", This, debugstr_w(pwzUrl), ParseAction, dwParseFlags, pwzResult, cchResult, pcchResult, dwReserved);
switch(ParseAction) { @@ -478,7 +478,7 @@ static HRESULT WINAPI ITSProtocolInfo_CombineUrl(IInternetProtocolInfo *iface, LPCWSTR base_end, ptr; DWORD rel_len;
- TRACE("(%p)->(%s %s %08x %p %d %p %d)\n", This, debugstr_w(pwzBaseUrl), + TRACE("(%p)->(%s %s %08lx %p %ld %p %ld)\n", This, debugstr_w(pwzBaseUrl), debugstr_w(pwzRelativeUrl), dwCombineFlags, pwzResult, cchResult, pcchResult, dwReserved);
@@ -520,7 +520,7 @@ static HRESULT WINAPI ITSProtocolInfo_CompareUrl(IInternetProtocolInfo *iface, L LPCWSTR pwzUrl2, DWORD dwCompareFlags) { ITSProtocol *This = impl_from_IInternetProtocolInfo(iface); - FIXME("%p)->(%s %s %08x)\n", This, debugstr_w(pwzUrl1), debugstr_w(pwzUrl2), dwCompareFlags); + FIXME("%p)->(%s %s %08lx)\n", This, debugstr_w(pwzUrl1), debugstr_w(pwzUrl2), dwCompareFlags); return E_NOTIMPL; }
@@ -529,7 +529,7 @@ static HRESULT WINAPI ITSProtocolInfo_QueryInfo(IInternetProtocolInfo *iface, LP DWORD dwReserved) { ITSProtocol *This = impl_from_IInternetProtocolInfo(iface); - FIXME("(%p)->(%s %08x %08x %p %d %p %d)\n", This, debugstr_w(pwzUrl), QueryOption, + FIXME("(%p)->(%s %08x %08lx %p %ld %p %ld)\n", This, debugstr_w(pwzUrl), QueryOption, dwQueryFlags, pBuffer, cbBuffer, pcbBuf, dwReserved); return E_NOTIMPL; } diff --git a/dlls/itss/storage.c b/dlls/itss/storage.c index ee5432d4d61..82c6b5442d9 100644 --- a/dlls/itss/storage.c +++ b/dlls/itss/storage.c @@ -151,7 +151,7 @@ static HRESULT WINAPI ITSS_IEnumSTATSTG_Next( DWORD len, n; struct enum_info *cur;
- TRACE("%p %u %p %p\n", This, celt, rgelt, pceltFetched ); + TRACE("%p %lu %p %p\n", This, celt, rgelt, pceltFetched );
cur = This->current; n = 0; @@ -203,7 +203,7 @@ static HRESULT WINAPI ITSS_IEnumSTATSTG_Skip( DWORD n; struct enum_info *cur;
- TRACE("%p %u\n", This, celt ); + TRACE("%p %lu\n", This, celt );
cur = This->current; n = 0; @@ -340,7 +340,7 @@ static HRESULT WINAPI ITSS_IStorageImpl_OpenStream( int r; WCHAR *path, *p;
- TRACE("%p %s %p %u %u %p\n", This, debugstr_w(pwcsName), + TRACE("%p %s %p %lu %lu %p\n", This, debugstr_w(pwcsName), reserved1, grfMode, reserved2, ppstm );
len = lstrlenW( This->dir ) + lstrlenW( pwcsName ) + 1; @@ -408,7 +408,7 @@ static HRESULT WINAPI ITSS_IStorageImpl_OpenStorage( WCHAR *path, *p; DWORD len;
- TRACE("%p %s %p %u %p %u %p\n", This, debugstr_w(pwcsName), + TRACE("%p %s %p %lu %p %lu %p\n", This, debugstr_w(pwcsName), pstgPriority, grfMode, snbExclude, reserved, ppstg);
chmfile = chm_dup( This->chmfile ); @@ -515,7 +515,7 @@ static HRESULT WINAPI ITSS_IStorageImpl_EnumElements( ITSS_IStorageImpl *This = impl_from_IStorage(iface); IEnumSTATSTG_Impl* stgenum;
- TRACE("%p %d %p %d %p\n", This, reserved1, reserved2, reserved3, ppenum ); + TRACE("%p %ld %p %ld %p\n", This, reserved1, reserved2, reserved3, ppenum );
stgenum = ITSS_create_enum(); if( !stgenum ) @@ -704,7 +704,7 @@ static HRESULT WINAPI ITSS_IStream_Read( IStream_Impl *This = impl_from_IStream(iface); ULONG count;
- TRACE("%p %p %u %p\n", This, pv, cb, pcbRead); + TRACE("%p %p %lu %p\n", This, pv, cb, pcbRead);
count = chm_retrieve_object(This->stg->chmfile, &This->ui, pv, This->addr, cb); @@ -734,7 +734,7 @@ static HRESULT WINAPI ITSS_IStream_Seek( IStream_Impl *This = impl_from_IStream(iface); LONGLONG newpos;
- TRACE("%p %s %u %p\n", This, + TRACE("%p %s %lu %p\n", This, wine_dbgstr_longlong( dlibMove.QuadPart ), dwOrigin, plibNewPosition );
newpos = This->addr; @@ -822,7 +822,7 @@ static HRESULT WINAPI ITSS_IStream_Stat( { IStream_Impl *This = impl_from_IStream(iface);
- TRACE("%p %p %d\n", This, pstatstg, grfStatFlag); + TRACE("%p %p %ld\n", This, pstatstg, grfStatFlag);
memset( pstatstg, 0, sizeof *pstatstg ); if( !( grfStatFlag & STATFLAG_NONAME ) )