Commit 334b3f2b authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard

sxs: Enable compilation with long types.

parent bd575863
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = sxs.dll MODULE = sxs.dll
IMPORTS = oleaut32 ole32 IMPORTS = oleaut32 ole32
IMPORTLIB = sxs IMPORTLIB = sxs
......
...@@ -203,7 +203,7 @@ static HRESULT WINAPI cache_QueryAssemblyInfo( ...@@ -203,7 +203,7 @@ static HRESULT WINAPI cache_QueryAssemblyInfo(
unsigned int len; unsigned int len;
HRESULT hr; 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))) if (flags || (info && info->cbAssemblyInfo != sizeof(*info)))
return E_INVALIDARG; return E_INVALIDARG;
...@@ -272,7 +272,7 @@ static HRESULT WINAPI cache_CreateAssemblyCacheItem( ...@@ -272,7 +272,7 @@ static HRESULT WINAPI cache_CreateAssemblyCacheItem(
IAssemblyCacheItem **item, IAssemblyCacheItem **item,
LPCWSTR name ) 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; return E_NOTIMPL;
} }
...@@ -363,7 +363,7 @@ static HRESULT parse_files( IXMLDOMDocument *doc, struct assembly *assembly ) ...@@ -363,7 +363,7 @@ static HRESULT parse_files( IXMLDOMDocument *doc, struct assembly *assembly )
hr = IXMLDOMNodeList_get_length( list, &len ); hr = IXMLDOMNodeList_get_length( list, &len );
if (hr != S_OK) goto done; if (hr != S_OK) goto done;
TRACE("found %d files\n", len); TRACE("found %ld files\n", len);
if (!len) if (!len)
{ {
hr = ERROR_SXS_MANIFEST_FORMAT_ERROR; hr = ERROR_SXS_MANIFEST_FORMAT_ERROR;
...@@ -530,7 +530,7 @@ static HRESULT install_policy( const WCHAR *manifest, struct assembly *assembly ...@@ -530,7 +530,7 @@ static HRESULT install_policy( const WCHAR *manifest, struct assembly *assembly
if (!ret) if (!ret)
{ {
HRESULT hr = HRESULT_FROM_WIN32( GetLastError() ); 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 hr;
} }
return S_OK; return S_OK;
...@@ -619,7 +619,7 @@ static HRESULT install_assembly( const WCHAR *manifest, struct assembly *assembl ...@@ -619,7 +619,7 @@ static HRESULT install_assembly( const WCHAR *manifest, struct assembly *assembl
if (!ret) if (!ret)
{ {
hr = HRESULT_FROM_WIN32( GetLastError() ); 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; return hr;
} }
...@@ -652,7 +652,7 @@ static HRESULT install_assembly( const WCHAR *manifest, struct assembly *assembl ...@@ -652,7 +652,7 @@ static HRESULT install_assembly( const WCHAR *manifest, struct assembly *assembl
if (!ret) if (!ret)
{ {
hr = HRESULT_FROM_WIN32( GetLastError() ); 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; goto done;
} }
} }
...@@ -674,7 +674,7 @@ static HRESULT WINAPI cache_InstallAssembly( ...@@ -674,7 +674,7 @@ static HRESULT WINAPI cache_InstallAssembly(
IXMLDOMDocument *doc = NULL; IXMLDOMDocument *doc = NULL;
struct assembly *assembly = 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 ); cache_lock( cache );
init = CoInitialize( NULL ); init = CoInitialize( NULL );
...@@ -724,7 +724,7 @@ static HRESULT uninstall_assembly( struct assembly *assembly ) ...@@ -724,7 +724,7 @@ static HRESULT uninstall_assembly( struct assembly *assembly )
lstrcatW( filename, backslashW ); lstrcatW( filename, backslashW );
lstrcatW( filename, file->name ); 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 ); HeapFree( GetProcessHeap(), 0, filename );
} }
RemoveDirectoryW( dirname ); RemoveDirectoryW( dirname );
...@@ -751,7 +751,7 @@ static HRESULT WINAPI cache_UninstallAssembly( ...@@ -751,7 +751,7 @@ static HRESULT WINAPI cache_UninstallAssembly(
const WCHAR *arch, *name, *token, *type, *version; const WCHAR *arch, *name, *token, *type, *version;
WCHAR *p, *path = NULL; 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) if (ref)
{ {
...@@ -790,7 +790,7 @@ static HRESULT WINAPI cache_UninstallAssembly( ...@@ -790,7 +790,7 @@ static HRESULT WINAPI cache_UninstallAssembly(
if ((hr = load_manifest( doc, path )) != S_OK) goto done; if ((hr = load_manifest( doc, path )) != S_OK) goto done;
if ((hr = parse_assembly( doc, &assembly )) != 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, '\\' ))) else if ((p = wcsrchr( path, '\\' )))
{ {
*p = 0; *p = 0;
...@@ -827,7 +827,7 @@ HRESULT WINAPI CreateAssemblyCache( IAssemblyCache **obj, DWORD reserved ) ...@@ -827,7 +827,7 @@ HRESULT WINAPI CreateAssemblyCache( IAssemblyCache **obj, DWORD reserved )
{ {
struct cache *cache; struct cache *cache;
TRACE("%p, %u\n", obj, reserved); TRACE("%p, %lu\n", obj, reserved);
if (!obj) if (!obj)
return E_INVALIDARG; return E_INVALIDARG;
......
...@@ -104,7 +104,7 @@ static HRESULT WINAPI name_SetProperty( ...@@ -104,7 +104,7 @@ static HRESULT WINAPI name_SetProperty(
LPVOID property, LPVOID property,
DWORD size ) 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; return E_NOTIMPL;
} }
...@@ -114,7 +114,7 @@ static HRESULT WINAPI name_GetProperty( ...@@ -114,7 +114,7 @@ static HRESULT WINAPI name_GetProperty(
LPVOID buffer, LPVOID buffer,
LPDWORD buflen ) 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; return E_NOTIMPL;
} }
...@@ -135,7 +135,7 @@ static HRESULT WINAPI name_GetDisplayName( ...@@ -135,7 +135,7 @@ static HRESULT WINAPI name_GetDisplayName(
struct name *name = impl_from_IAssemblyName( iface ); struct name *name = impl_from_IAssemblyName( iface );
unsigned int len; 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; if (!buflen || flags) return E_INVALIDARG;
...@@ -169,7 +169,7 @@ static HRESULT WINAPI name_Reserved( ...@@ -169,7 +169,7 @@ static HRESULT WINAPI name_Reserved(
DWORD cbReserved, DWORD cbReserved,
LPVOID *ppReserved ) 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_guid(riid), pUnkReserved1, pUnkReserved2,
debugstr_w(szReserved), wine_dbgstr_longlong(llReserved), debugstr_w(szReserved), wine_dbgstr_longlong(llReserved),
pvReserved, cbReserved, ppReserved); pvReserved, cbReserved, ppReserved);
...@@ -262,7 +262,7 @@ static HRESULT WINAPI name_IsEqual( ...@@ -262,7 +262,7 @@ static HRESULT WINAPI name_IsEqual(
IAssemblyName *name2, IAssemblyName *name2,
DWORD flags ) DWORD flags )
{ {
FIXME("%p, %p, 0x%08x\n", name1, name2, flags); FIXME("%p, %p, 0x%08lx\n", name1, name2, flags);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -368,7 +368,7 @@ HRESULT WINAPI CreateAssemblyNameObject( ...@@ -368,7 +368,7 @@ HRESULT WINAPI CreateAssemblyNameObject(
struct name *name; struct name *name;
HRESULT hr; 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; if (!obj) return E_INVALIDARG;
......
...@@ -104,7 +104,7 @@ BOOL WINAPI SxsLookupClrGuid(DWORD flags, GUID *clsid, HANDLE actctx, void *buff ...@@ -104,7 +104,7 @@ BOOL WINAPI SxsLookupClrGuid(DWORD flags, GUID *clsid, HANDLE actctx, void *buff
char *ret_strings; char *ret_strings;
ULONG_PTR cookie; 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); buffer, buffer_len, buffer_len_required);
if (flags & SXS_LOOKUP_CLR_GUID_USE_ACTCTX) if (flags & SXS_LOOKUP_CLR_GUID_USE_ACTCTX)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment