Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- dlls/fusion/Makefile.in | 1 - dlls/fusion/asmcache.c | 22 +++++++++++----------- dlls/fusion/asmenum.c | 8 ++++---- dlls/fusion/asmname.c | 16 ++++++++-------- dlls/fusion/fusion.c | 2 +- 5 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/dlls/fusion/Makefile.in b/dlls/fusion/Makefile.in index 71d3166500e..093b64c0d32 100644 --- a/dlls/fusion/Makefile.in +++ b/dlls/fusion/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = fusion.dll IMPORTS = bcrypt dbghelp shlwapi version user32
diff --git a/dlls/fusion/asmcache.c b/dlls/fusion/asmcache.c index 94a61ea255c..b9cb505de86 100644 --- a/dlls/fusion/asmcache.c +++ b/dlls/fusion/asmcache.c @@ -182,7 +182,7 @@ static ULONG WINAPI IAssemblyCacheImpl_AddRef(IAssemblyCache *iface) IAssemblyCacheImpl *This = impl_from_IAssemblyCache(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; } @@ -192,7 +192,7 @@ static ULONG WINAPI IAssemblyCacheImpl_Release(IAssemblyCache *iface) IAssemblyCacheImpl *cache = impl_from_IAssemblyCache(iface); ULONG refCount = InterlockedDecrement( &cache->ref );
- TRACE("(%p)->(ref before = %u)\n", cache, refCount + 1); + TRACE("(%p)->(ref before = %lu)\n", cache, refCount + 1);
if (!refCount) { @@ -226,7 +226,7 @@ static HRESULT WINAPI IAssemblyCacheImpl_UninstallAssembly(IAssemblyCache *iface ULONG disp; DWORD len;
- TRACE("(%p, 0%08x, %s, %p, %p)\n", iface, dwFlags, + TRACE("(%p, 0%08lx, %s, %p, %p)\n", iface, dwFlags, debugstr_w(pszAssemblyName), pRefData, pulDisposition);
if (pRefData) @@ -305,7 +305,7 @@ static HRESULT WINAPI IAssemblyCacheImpl_QueryAssemblyInfo(IAssemblyCache *iface IAssemblyEnum *asmenum = NULL; HRESULT hr;
- TRACE("(%p, %d, %s, %p)\n", iface, dwFlags, + TRACE("(%p, %ld, %s, %p)\n", iface, dwFlags, debugstr_w(pszAssemblyName), pAsmInfo);
if (pAsmInfo) @@ -364,7 +364,7 @@ static HRESULT WINAPI IAssemblyCacheImpl_CreateAssemblyCacheItem(IAssemblyCache { IAssemblyCacheItemImpl *item;
- FIXME("(%p, %d, %p, %p, %s) semi-stub!\n", iface, dwFlags, pvReserved, + FIXME("(%p, %ld, %p, %p, %s) semi-stub!\n", iface, dwFlags, pvReserved, ppAsmItem, debugstr_w(pszAssemblyName));
if (!ppAsmItem) @@ -435,7 +435,7 @@ static HRESULT WINAPI IAssemblyCacheImpl_InstallAssembly(IAssemblyCache *iface, DWORD i, count = 0, src_len, dst_len = ARRAY_SIZE(format_v40); HRESULT hr;
- TRACE("(%p, %d, %s, %p)\n", iface, dwFlags, + TRACE("(%p, %ld, %s, %p)\n", iface, dwFlags, debugstr_w(pszManifestFilePath), pRefData);
if (!pszManifestFilePath || !*pszManifestFilePath) @@ -553,7 +553,7 @@ HRESULT WINAPI CreateAssemblyCache(IAssemblyCache **ppAsmCache, DWORD dwReserved { IAssemblyCacheImpl *cache;
- TRACE("(%p, %d)\n", ppAsmCache, dwReserved); + TRACE("(%p, %ld)\n", ppAsmCache, dwReserved);
if (!ppAsmCache) return E_INVALIDARG; @@ -607,7 +607,7 @@ static ULONG WINAPI IAssemblyCacheItemImpl_AddRef(IAssemblyCacheItem *iface) IAssemblyCacheItemImpl *This = impl_from_IAssemblyCacheItem(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; } @@ -617,7 +617,7 @@ static ULONG WINAPI IAssemblyCacheItemImpl_Release(IAssemblyCacheItem *iface) IAssemblyCacheItemImpl *This = impl_from_IAssemblyCacheItem(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) heap_free(This); @@ -633,7 +633,7 @@ static HRESULT WINAPI IAssemblyCacheItemImpl_CreateStream(IAssemblyCacheItem *if IStream **ppIStream, ULARGE_INTEGER *puliMaxSize) { - FIXME("(%p, %d, %s, %d, %d, %p, %p) stub!\n", iface, dwFlags, + FIXME("(%p, %ld, %s, %ld, %ld, %p, %p) stub!\n", iface, dwFlags, debugstr_w(pszStreamName), dwFormat, dwFormatFlags, ppIStream, puliMaxSize);
return E_NOTIMPL; @@ -643,7 +643,7 @@ static HRESULT WINAPI IAssemblyCacheItemImpl_Commit(IAssemblyCacheItem *iface, DWORD dwFlags, ULONG *pulDisposition) { - FIXME("(%p, %d, %p) stub!\n", iface, dwFlags, pulDisposition); + FIXME("(%p, %ld, %p) stub!\n", iface, dwFlags, pulDisposition); return E_NOTIMPL; }
diff --git a/dlls/fusion/asmenum.c b/dlls/fusion/asmenum.c index 35f8099e822..d545e2533b5 100644 --- a/dlls/fusion/asmenum.c +++ b/dlls/fusion/asmenum.c @@ -84,7 +84,7 @@ static ULONG WINAPI IAssemblyEnumImpl_AddRef(IAssemblyEnum *iface) IAssemblyEnumImpl *This = impl_from_IAssemblyEnum(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; } @@ -95,7 +95,7 @@ static ULONG WINAPI IAssemblyEnumImpl_Release(IAssemblyEnum *iface) ULONG refCount = InterlockedDecrement(&This->ref); struct list *item, *cursor;
- TRACE("(%p)->(ref before = %u)\n", This, refCount + 1); + TRACE("(%p)->(ref before = %lu)\n", This, refCount + 1);
if (!refCount) { @@ -122,7 +122,7 @@ static HRESULT WINAPI IAssemblyEnumImpl_GetNextAssembly(IAssemblyEnum *iface, IAssemblyEnumImpl *asmenum = impl_from_IAssemblyEnum(iface); ASMNAME *asmname;
- TRACE("(%p, %p, %p, %d)\n", iface, pvReserved, ppName, dwFlags); + TRACE("(%p, %p, %p, %ld)\n", iface, pvReserved, ppName, dwFlags);
if (!ppName) return E_INVALIDARG; @@ -466,7 +466,7 @@ HRESULT WINAPI CreateAssemblyEnum(IAssemblyEnum **pEnum, IUnknown *pUnkReserved, IAssemblyEnumImpl *asmenum; HRESULT hr;
- TRACE("(%p, %p, %p, %08x, %p)\n", pEnum, pUnkReserved, + TRACE("(%p, %p, %p, %08lx, %p)\n", pEnum, pUnkReserved, pName, dwFlags, pvReserved);
if (!pEnum) diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index 966a8f20eb4..8a6531df0b8 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -100,7 +100,7 @@ static ULONG WINAPI IAssemblyNameImpl_AddRef(IAssemblyName *iface) IAssemblyNameImpl *This = impl_from_IAssemblyName(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; } @@ -110,7 +110,7 @@ static ULONG WINAPI IAssemblyNameImpl_Release(IAssemblyName *iface) IAssemblyNameImpl *This = impl_from_IAssemblyName(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) { @@ -130,7 +130,7 @@ static HRESULT WINAPI IAssemblyNameImpl_SetProperty(IAssemblyName *iface, LPVOID pvProperty, DWORD cbProperty) { - FIXME("(%p, %d, %p, %d) stub!\n", iface, PropertyId, pvProperty, cbProperty); + FIXME("(%p, %ld, %p, %ld) stub!\n", iface, PropertyId, pvProperty, cbProperty); return E_NOTIMPL; }
@@ -142,7 +142,7 @@ static HRESULT WINAPI IAssemblyNameImpl_GetProperty(IAssemblyName *iface, IAssemblyNameImpl *name = impl_from_IAssemblyName(iface); DWORD size;
- TRACE("(%p, %d, %p, %p)\n", iface, PropertyId, pvProperty, pcbProperty); + TRACE("(%p, %ld, %p, %p)\n", iface, PropertyId, pvProperty, pcbProperty);
size = *pcbProperty; switch (PropertyId) @@ -268,7 +268,7 @@ static HRESULT WINAPI IAssemblyNameImpl_GetDisplayName(IAssemblyName *iface, WCHAR verstr[30], *cultureval = NULL; DWORD size;
- TRACE("(%p, %p, %p, %d)\n", iface, szDisplayName, + TRACE("(%p, %p, %p, %ld)\n", iface, szDisplayName, pccDisplayName, dwDisplayFlags);
if (dwDisplayFlags == 0) @@ -398,7 +398,7 @@ static HRESULT WINAPI IAssemblyNameImpl_Reserved(IAssemblyName *iface, DWORD cbReserved, LPVOID *ppReserved) { - TRACE("(%p, %s, %p, %p, %s, %s, %p, %d, %p)\n", iface, + TRACE("(%p, %s, %p, %p, %s, %s, %p, %ld, %p)\n", iface, debugstr_guid(refIID), pUnkReserved1, pUnkReserved2, debugstr_w(szReserved), wine_dbgstr_longlong(llReserved), pvReserved, cbReserved, ppReserved); @@ -459,7 +459,7 @@ static HRESULT WINAPI IAssemblyNameImpl_IsEqual(IAssemblyName *iface, IAssemblyNameImpl *name1 = impl_from_IAssemblyName(iface); IAssemblyNameImpl *name2 = impl_from_IAssemblyName(pName);
- TRACE("(%p, %p, 0x%08x)\n", iface, pName, flags); + TRACE("(%p, %p, 0x%08lx)\n", iface, pName, flags);
if (!pName) return S_FALSE; if (flags & ~ASM_CMPF_IL_ALL) FIXME("unsupported flags\n"); @@ -798,7 +798,7 @@ HRESULT WINAPI CreateAssemblyNameObject(IAssemblyName **ppAssemblyNameObj, IAssemblyNameImpl *name; HRESULT hr;
- TRACE("(%p, %s, %08x, %p)\n", ppAssemblyNameObj, + TRACE("(%p, %s, %08lx, %p)\n", ppAssemblyNameObj, debugstr_w(szAssemblyName), dwFlags, pvReserved);
if (!ppAssemblyNameObj) diff --git a/dlls/fusion/fusion.c b/dlls/fusion/fusion.c index 0787bf0f2ac..c7d3f3bca00 100644 --- a/dlls/fusion/fusion.c +++ b/dlls/fusion/fusion.c @@ -66,7 +66,7 @@ HRESULT WINAPI CreateInstallReferenceEnum(IInstallReferenceEnum **ppRefEnum, IAssemblyName *pName, DWORD dwFlags, LPVOID pvReserved) { - FIXME("(%p, %p, %08x, %p) stub!\n", ppRefEnum, pName, dwFlags, pvReserved); + FIXME("(%p, %p, %08lx, %p) stub!\n", ppRefEnum, pName, dwFlags, pvReserved); return E_NOTIMPL; }