Module: wine Branch: master Commit: 334b3f2b5c645340c4910b068c5e483e2e8c333b URL: https://source.winehq.org/git/wine.git/?a=commit;h=334b3f2b5c645340c4910b068...
Author: Eric Pouech eric.pouech@gmail.com Date: Fri Feb 18 09:17:10 2022 +0100
sxs: Enable compilation with long types.
Signed-off-by: Eric Pouech eric.pouech@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/sxs/Makefile.in | 1 - dlls/sxs/cache.c | 22 +++++++++++----------- dlls/sxs/name.c | 12 ++++++------ dlls/sxs/sxs.c | 2 +- 4 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/dlls/sxs/Makefile.in b/dlls/sxs/Makefile.in index 27a5c58bdd0..867ea270f3d 100644 --- a/dlls/sxs/Makefile.in +++ b/dlls/sxs/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = sxs.dll IMPORTS = oleaut32 ole32 IMPORTLIB = sxs diff --git a/dlls/sxs/cache.c b/dlls/sxs/cache.c index e4fdda8c860..02403501231 100644 --- a/dlls/sxs/cache.c +++ b/dlls/sxs/cache.c @@ -203,7 +203,7 @@ static HRESULT WINAPI cache_QueryAssemblyInfo( unsigned int len; HRESULT hr;
- TRACE("%p, 0x%08x, %s, %p\n", iface, flags, debugstr_w(assembly_name), info); + TRACE("%p, 0x%08lx, %s, %p\n", iface, flags, debugstr_w(assembly_name), info);
if (flags || (info && info->cbAssemblyInfo != sizeof(*info))) return E_INVALIDARG; @@ -272,7 +272,7 @@ static HRESULT WINAPI cache_CreateAssemblyCacheItem( IAssemblyCacheItem **item, LPCWSTR name ) { - FIXME("%p, 0x%08x, %p, %p, %s\n", iface, flags, reserved, item, debugstr_w(name)); + FIXME("%p, 0x%08lx, %p, %p, %s\n", iface, flags, reserved, item, debugstr_w(name)); return E_NOTIMPL; }
@@ -363,7 +363,7 @@ static HRESULT parse_files( IXMLDOMDocument *doc, struct assembly *assembly )
hr = IXMLDOMNodeList_get_length( list, &len ); if (hr != S_OK) goto done; - TRACE("found %d files\n", len); + TRACE("found %ld files\n", len); if (!len) { hr = ERROR_SXS_MANIFEST_FORMAT_ERROR; @@ -530,7 +530,7 @@ static HRESULT install_policy( const WCHAR *manifest, struct assembly *assembly if (!ret) { HRESULT hr = HRESULT_FROM_WIN32( GetLastError() ); - WARN("failed to copy policy manifest file 0x%08x\n", hr); + WARN("failed to copy policy manifest file 0x%08lx\n", hr); return hr; } return S_OK; @@ -619,7 +619,7 @@ static HRESULT install_assembly( const WCHAR *manifest, struct assembly *assembl if (!ret) { hr = HRESULT_FROM_WIN32( GetLastError() ); - WARN("failed to copy manifest file 0x%08x\n", hr); + WARN("failed to copy manifest file 0x%08lx\n", hr); return hr; }
@@ -652,7 +652,7 @@ static HRESULT install_assembly( const WCHAR *manifest, struct assembly *assembl if (!ret) { hr = HRESULT_FROM_WIN32( GetLastError() ); - WARN("failed to copy file 0x%08x\n", hr); + WARN("failed to copy file 0x%08lx\n", hr); goto done; } } @@ -674,7 +674,7 @@ static HRESULT WINAPI cache_InstallAssembly( IXMLDOMDocument *doc = NULL; struct assembly *assembly = NULL;
- TRACE("%p, 0x%08x, %s, %p\n", iface, flags, debugstr_w(path), ref); + TRACE("%p, 0x%08lx, %s, %p\n", iface, flags, debugstr_w(path), ref);
cache_lock( cache ); init = CoInitialize( NULL ); @@ -724,7 +724,7 @@ static HRESULT uninstall_assembly( struct assembly *assembly ) lstrcatW( filename, backslashW ); lstrcatW( filename, file->name );
- if (!DeleteFileW( filename )) WARN( "failed to delete file %u\n", GetLastError() ); + if (!DeleteFileW( filename )) WARN( "failed to delete file %lu\n", GetLastError() ); HeapFree( GetProcessHeap(), 0, filename ); } RemoveDirectoryW( dirname ); @@ -751,7 +751,7 @@ static HRESULT WINAPI cache_UninstallAssembly( const WCHAR *arch, *name, *token, *type, *version; WCHAR *p, *path = NULL;
- TRACE("%p, 0x%08x, %s, %p, %p\n", iface, flags, debugstr_w(assembly_name), ref, disp); + TRACE("%p, 0x%08lx, %s, %p, %p\n", iface, flags, debugstr_w(assembly_name), ref, disp);
if (ref) { @@ -790,7 +790,7 @@ static HRESULT WINAPI cache_UninstallAssembly( if ((hr = load_manifest( doc, path )) != S_OK) goto done; if ((hr = parse_assembly( doc, &assembly )) != S_OK) goto done;
- if (!DeleteFileW( path )) WARN( "unable to remove manifest file %u\n", GetLastError() ); + if (!DeleteFileW( path )) WARN( "unable to remove manifest file %lu\n", GetLastError() ); else if ((p = wcsrchr( path, '\' ))) { *p = 0; @@ -827,7 +827,7 @@ HRESULT WINAPI CreateAssemblyCache( IAssemblyCache **obj, DWORD reserved ) { struct cache *cache;
- TRACE("%p, %u\n", obj, reserved); + TRACE("%p, %lu\n", obj, reserved);
if (!obj) return E_INVALIDARG; diff --git a/dlls/sxs/name.c b/dlls/sxs/name.c index 0fab45c5018..29368b6d788 100644 --- a/dlls/sxs/name.c +++ b/dlls/sxs/name.c @@ -104,7 +104,7 @@ static HRESULT WINAPI name_SetProperty( LPVOID property, DWORD size ) { - FIXME("%p, %d, %p, %d\n", iface, id, property, size); + FIXME("%p, %ld, %p, %ld\n", iface, id, property, size); return E_NOTIMPL; }
@@ -114,7 +114,7 @@ static HRESULT WINAPI name_GetProperty( LPVOID buffer, LPDWORD buflen ) { - FIXME("%p, %d, %p, %p\n", iface, id, buffer, buflen); + FIXME("%p, %ld, %p, %p\n", iface, id, buffer, buflen); return E_NOTIMPL; }
@@ -135,7 +135,7 @@ static HRESULT WINAPI name_GetDisplayName( struct name *name = impl_from_IAssemblyName( iface ); unsigned int len;
- TRACE("%p, %p, %p, 0x%08x\n", iface, buffer, buflen, flags); + TRACE("%p, %p, %p, 0x%08lx\n", iface, buffer, buflen, flags);
if (!buflen || flags) return E_INVALIDARG;
@@ -169,7 +169,7 @@ static HRESULT WINAPI name_Reserved( DWORD cbReserved, LPVOID *ppReserved ) { - FIXME("%p, %s, %p, %p, %s, %s, %p, %d, %p\n", iface, + FIXME("%p, %s, %p, %p, %s, %s, %p, %ld, %p\n", iface, debugstr_guid(riid), pUnkReserved1, pUnkReserved2, debugstr_w(szReserved), wine_dbgstr_longlong(llReserved), pvReserved, cbReserved, ppReserved); @@ -262,7 +262,7 @@ static HRESULT WINAPI name_IsEqual( IAssemblyName *name2, DWORD flags ) { - FIXME("%p, %p, 0x%08x\n", name1, name2, flags); + FIXME("%p, %p, 0x%08lx\n", name1, name2, flags); return E_NOTIMPL; }
@@ -368,7 +368,7 @@ HRESULT WINAPI CreateAssemblyNameObject( struct name *name; HRESULT hr;
- TRACE("%p, %s, 0x%08x, %p\n", obj, debugstr_w(assembly), flags, reserved); + TRACE("%p, %s, 0x%08lx, %p\n", obj, debugstr_w(assembly), flags, reserved);
if (!obj) return E_INVALIDARG;
diff --git a/dlls/sxs/sxs.c b/dlls/sxs/sxs.c index 2fa4dc0262b..934aa9345c8 100644 --- a/dlls/sxs/sxs.c +++ b/dlls/sxs/sxs.c @@ -104,7 +104,7 @@ BOOL WINAPI SxsLookupClrGuid(DWORD flags, GUID *clsid, HANDLE actctx, void *buff char *ret_strings; ULONG_PTR cookie;
- TRACE("%#x, %s, %p, %p, %lx, %p.\n", flags, wine_dbgstr_guid(clsid), actctx, + TRACE("%#lx, %s, %p, %p, %Ix, %p.\n", flags, wine_dbgstr_guid(clsid), actctx, buffer, buffer_len, buffer_len_required);
if (flags & SXS_LOOKUP_CLR_GUID_USE_ACTCTX)