Skip to content

W
wine-winehq
Commit 119f6e7b authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard
Browse files
Options

opcservices: Build without -DWINE_NO_LONG_TYPES.

Signed-off-by: 's avatarNikolay Sivov <nsivov@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 40c6c18b
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 52 deletions
dlls/opcservices/Makefile.in
View file @ 119f6e7b
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = opcservices.dll
IMPORTS = $(ZLIB_PE_LIBS) uuid ole32 advapi32 urlmon xmllite oleaut32
EXTRAINCL = $(ZLIB_PE_CFLAGS)
......
dlls/opcservices/compress.c
View file @ 119f6e7b
......@@ -152,7 +152,8 @@ static void compress_write(struct zip_archive *archive, void *data, ULONG size)
archive->position += written;
if (FAILED(archive->write_result))
WARN("Failed to write output %p, size %u, written %u, hr %#x.\n", data, size, written, archive->write_result);
WARN("Failed to write output %p, size %lu, written %lu, hr %#lx.\n",
data, size, written, archive->write_result);
}
void compress_finalize_archive(struct zip_archive *archive)
......
dlls/opcservices/factory.c
View file @ 119f6e7b
......@@ -70,7 +70,7 @@ static ULONG WINAPI opc_filestream_AddRef(IStream *iface)
struct opc_filestream *stream = impl_from_IStream(iface);
ULONG refcount = InterlockedIncrement(&stream->refcount);
TRACE("%p increasing refcount to %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
......@@ -80,7 +80,7 @@ static ULONG WINAPI opc_filestream_Release(IStream *iface)
struct opc_filestream *stream = impl_from_IStream(iface);
ULONG refcount = InterlockedDecrement(&stream->refcount);
TRACE("%p decreasing refcount to %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
{
......@@ -96,7 +96,7 @@ static HRESULT WINAPI opc_filestream_Read(IStream *iface, void *buff, ULONG size
struct opc_filestream *stream = impl_from_IStream(iface);
DWORD read = 0;
TRACE("iface %p, buff %p, size %u, num_read %p.\n", iface, buff, size, num_read);
TRACE("%p, %p, %lu, %p.\n", iface, buff, size, num_read);
if (!num_read)
num_read = &read;
......@@ -104,7 +104,7 @@ static HRESULT WINAPI opc_filestream_Read(IStream *iface, void *buff, ULONG size
*num_read = 0;
if (!ReadFile(stream->hfile, buff, size, num_read, NULL))
{
WARN("Failed to read file, error %d.\n", GetLastError());
WARN("Failed to read file, error %ld.\n", GetLastError());
return HRESULT_FROM_WIN32(GetLastError());
}
......@@ -116,7 +116,7 @@ static HRESULT WINAPI opc_filestream_Write(IStream *iface, const void *data, ULO
struct opc_filestream *stream = impl_from_IStream(iface);
DWORD written = 0;
TRACE("iface %p, data %p, size %u, num_written %p.\n", iface, data, size, num_written);
TRACE("%p, %p, %lu, %p.\n", iface, data, size, num_written);
if (!num_written)
num_written = &written;
......@@ -124,7 +124,7 @@ static HRESULT WINAPI opc_filestream_Write(IStream *iface, const void *data, ULO
*num_written = 0;
if (!WriteFile(stream->hfile, data, size, num_written, NULL))
{
WARN("Failed to write to file, error %d.\n", GetLastError());
WARN("Failed to write to file, error %ld.\n", GetLastError());
return HRESULT_FROM_WIN32(GetLastError());
}
......@@ -135,7 +135,7 @@ static HRESULT WINAPI opc_filestream_Seek(IStream *iface, LARGE_INTEGER move, DW
{
struct opc_filestream *stream = impl_from_IStream(iface);
TRACE("iface %p, move %s, origin %d, newpos %p.\n", iface, wine_dbgstr_longlong(move.QuadPart), origin, newpos);
TRACE("%p, %s, %ld, %p.\n", iface, wine_dbgstr_longlong(move.QuadPart), origin, newpos);
if (!SetFilePointerEx(stream->hfile, move, (LARGE_INTEGER *)newpos, origin))
return HRESULT_FROM_WIN32(GetLastError());
......@@ -161,7 +161,7 @@ static HRESULT WINAPI opc_filestream_CopyTo(IStream *iface, IStream *dest, ULARG
static HRESULT WINAPI opc_filestream_Commit(IStream *iface, DWORD flags)
{
FIXME("iface %p, flags %#x stub!\n", iface, flags);
FIXME("%p, %#lx stub!\n", iface, flags);
return E_NOTIMPL;
}
......@@ -176,7 +176,7 @@ static HRESULT WINAPI opc_filestream_Revert(IStream *iface)
static HRESULT WINAPI opc_filestream_LockRegion(IStream *iface, ULARGE_INTEGER offset,
ULARGE_INTEGER size, DWORD lock_type)
{
FIXME("iface %p, offset %s, size %s, lock_type %d stub!\n", iface, wine_dbgstr_longlong(offset.QuadPart),
FIXME("%p, %s, %s, %ld stub!\n", iface, wine_dbgstr_longlong(offset.QuadPart),
wine_dbgstr_longlong(size.QuadPart), lock_type);
return E_NOTIMPL;
......@@ -185,7 +185,7 @@ static HRESULT WINAPI opc_filestream_LockRegion(IStream *iface, ULARGE_INTEGER o
static HRESULT WINAPI opc_filestream_UnlockRegion(IStream *iface, ULARGE_INTEGER offset, ULARGE_INTEGER size,
DWORD lock_type)
{
FIXME("iface %p, offset %s, size %s, lock_type %d stub!\n", iface, wine_dbgstr_longlong(offset.QuadPart),
FIXME("%p, %s, %s, %ld stub!\n", iface, wine_dbgstr_longlong(offset.QuadPart),
wine_dbgstr_longlong(size.QuadPart), lock_type);
return E_NOTIMPL;
......@@ -196,7 +196,7 @@ static HRESULT WINAPI opc_filestream_Stat(IStream *iface, STATSTG *statstg, DWOR
struct opc_filestream *stream = impl_from_IStream(iface);
BY_HANDLE_FILE_INFORMATION fi;
TRACE("iface %p, statstg %p, flag %d.\n", iface, statstg, flag);
TRACE("%p, %p, %#lx.\n", iface, statstg, flag);
if (!statstg)
return E_POINTER;
......@@ -332,13 +332,13 @@ static HRESULT WINAPI opc_factory_CreatePartUri(IOpcFactory *iface, LPCWSTR uri,
if (FAILED(hr = CreateUri(uri, Uri_CREATE_ALLOW_RELATIVE, 0, &part_uri)))
{
WARN("Failed to create uri, hr %#x.\n", hr);
WARN("Failed to create uri, hr %#lx.\n", hr);
return hr;
}
if (FAILED(hr = CreateUri(L"/", Uri_CREATE_ALLOW_RELATIVE, 0, &root_uri)))
{
WARN("Failed to create root uri, hr %#x.\n", hr);
WARN("Failed to create root uri, hr %#lx.\n", hr);
IUri_Release(part_uri);
return hr;
}
......@@ -348,7 +348,7 @@ static HRESULT WINAPI opc_factory_CreatePartUri(IOpcFactory *iface, LPCWSTR uri,
IUri_Release(part_uri);
if (FAILED(hr))
{
WARN("Failed to combine URIs, hr %#x.\n", hr);
WARN("Failed to combine URIs, hr %#lx.\n", hr);
return hr;
}
......@@ -360,8 +360,7 @@ static HRESULT WINAPI opc_factory_CreatePartUri(IOpcFactory *iface, LPCWSTR uri,
static HRESULT WINAPI opc_factory_CreateStreamOnFile(IOpcFactory *iface, LPCWSTR filename,
OPC_STREAM_IO_MODE io_mode, SECURITY_ATTRIBUTES *sa, DWORD flags, IStream **stream)
{
TRACE("iface %p, filename %s, io_mode %d, sa %p, flags %#x, stream %p.\n", iface, debugstr_w(filename),
io_mode, sa, flags, stream);
TRACE("%p, %s, %d, %p, %#lx, %p.\n", iface, debugstr_w(filename), io_mode, sa, flags, stream);
return opc_filestream_create(filename, io_mode, sa, flags, stream);
}
......
dlls/opcservices/package.c
View file @ 119f6e7b
......@@ -199,7 +199,7 @@ static ULONG WINAPI opc_part_enum_AddRef(IOpcPartEnumerator *iface)
struct opc_part_enum *part_enum = impl_from_IOpcPartEnumerator(iface);
ULONG refcount = InterlockedIncrement(&part_enum->refcount);
TRACE("%p increasing refcount to %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
......@@ -209,7 +209,7 @@ static ULONG WINAPI opc_part_enum_Release(IOpcPartEnumerator *iface)
struct opc_part_enum *part_enum = impl_from_IOpcPartEnumerator(iface);
ULONG refcount = InterlockedDecrement(&part_enum->refcount);
TRACE("%p decreasing refcount to %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
{
......@@ -360,7 +360,7 @@ static ULONG WINAPI opc_rel_enum_AddRef(IOpcRelationshipEnumerator *iface)
struct opc_rel_enum *rel_enum = impl_from_IOpcRelationshipEnumerator(iface);
ULONG refcount = InterlockedIncrement(&rel_enum->refcount);
TRACE("%p increasing refcount to %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
......@@ -370,7 +370,7 @@ static ULONG WINAPI opc_rel_enum_Release(IOpcRelationshipEnumerator *iface)
struct opc_rel_enum *rel_enum = impl_from_IOpcRelationshipEnumerator(iface);
ULONG refcount = InterlockedDecrement(&rel_enum->refcount);
TRACE("%p decreasing refcount to %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
{
......@@ -520,7 +520,7 @@ static ULONG WINAPI opc_content_stream_AddRef(IStream *iface)
struct opc_content_stream *stream = impl_from_IStream(iface);
ULONG refcount = InterlockedIncrement(&stream->refcount);
TRACE("%p increasing refcount to %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
......@@ -530,7 +530,7 @@ static ULONG WINAPI opc_content_stream_Release(IStream *iface)
struct opc_content_stream *stream = impl_from_IStream(iface);
ULONG refcount = InterlockedDecrement(&stream->refcount);
TRACE("%p decreasing refcount to %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
{
......@@ -546,7 +546,7 @@ static HRESULT WINAPI opc_content_stream_Read(IStream *iface, void *buff, ULONG
struct opc_content_stream *stream = impl_from_IStream(iface);
DWORD read = 0;
TRACE("iface %p, buff %p, size %u, num_read %p.\n", iface, buff, size, num_read);
TRACE("%p, %p, %lu, %p.\n", iface, buff, size, num_read);
if (!num_read)
num_read = &read;
......@@ -569,7 +569,7 @@ static HRESULT WINAPI opc_content_stream_Write(IStream *iface, const void *data,
struct opc_content_stream *stream = impl_from_IStream(iface);
DWORD written = 0;
TRACE("iface %p, data %p, size %u, num_written %p.\n", iface, data, size, num_written);
TRACE("%p, %p, %lu, %p.\n", iface, data, size, num_written);
if (!num_written)
num_written = &written;
......@@ -597,7 +597,7 @@ static HRESULT WINAPI opc_content_stream_Seek(IStream *iface, LARGE_INTEGER move
struct opc_content_stream *stream = impl_from_IStream(iface);
ULARGE_INTEGER pos;
TRACE("iface %p, move %s, origin %d, newpos %p.\n", iface, wine_dbgstr_longlong(move.QuadPart), origin, newpos);
TRACE("%p, %s, %ld, %p.\n", iface, wine_dbgstr_longlong(move.QuadPart), origin, newpos);
switch (origin)
{
......@@ -611,7 +611,7 @@ static HRESULT WINAPI opc_content_stream_Seek(IStream *iface, LARGE_INTEGER move
pos.QuadPart = stream->content->size.QuadPart + move.QuadPart;
break;
default:
WARN("Unknown origin mode %d.\n", origin);
WARN("Unknown origin mode %ld.\n", origin);
return E_INVALIDARG;
}
......@@ -641,7 +641,7 @@ static HRESULT WINAPI opc_content_stream_CopyTo(IStream *iface, IStream *dest, U
static HRESULT WINAPI opc_content_stream_Commit(IStream *iface, DWORD flags)
{
FIXME("iface %p, flags %#x stub!\n", iface, flags);
FIXME("iface %p, flags %#lx stub!\n", iface, flags);
return E_NOTIMPL;
}
......@@ -656,7 +656,7 @@ static HRESULT WINAPI opc_content_stream_Revert(IStream *iface)
static HRESULT WINAPI opc_content_stream_LockRegion(IStream *iface, ULARGE_INTEGER offset,
ULARGE_INTEGER size, DWORD lock_type)
{
FIXME("iface %p, offset %s, size %s, lock_type %d stub!\n", iface, wine_dbgstr_longlong(offset.QuadPart),
FIXME("iface %p, offset %s, size %s, lock_type %ld stub!\n", iface, wine_dbgstr_longlong(offset.QuadPart),
wine_dbgstr_longlong(size.QuadPart), lock_type);
return E_NOTIMPL;
......@@ -665,7 +665,7 @@ static HRESULT WINAPI opc_content_stream_LockRegion(IStream *iface, ULARGE_INTEG
static HRESULT WINAPI opc_content_stream_UnlockRegion(IStream *iface, ULARGE_INTEGER offset, ULARGE_INTEGER size,
DWORD lock_type)
{
FIXME("iface %p, offset %s, size %s, lock_type %d stub!\n", iface, wine_dbgstr_longlong(offset.QuadPart),
FIXME("iface %p, offset %s, size %s, lock_type %ld stub!\n", iface, wine_dbgstr_longlong(offset.QuadPart),
wine_dbgstr_longlong(size.QuadPart), lock_type);
return E_NOTIMPL;
......@@ -673,7 +673,7 @@ static HRESULT WINAPI opc_content_stream_UnlockRegion(IStream *iface, ULARGE_INT
static HRESULT WINAPI opc_content_stream_Stat(IStream *iface, STATSTG *statstg, DWORD flag)
{
FIXME("iface %p, statstg %p, flag %d stub!\n", iface, statstg, flag);
FIXME("iface %p, statstg %p, flag %ld stub!\n", iface, statstg, flag);
return E_NOTIMPL;
}
......@@ -761,7 +761,7 @@ static ULONG WINAPI opc_part_AddRef(IOpcPart *iface)
struct opc_part *part = impl_from_IOpcPart(iface);
ULONG refcount = InterlockedIncrement(&part->refcount);
TRACE("%p increasing refcount to %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
......@@ -771,7 +771,7 @@ static ULONG WINAPI opc_part_Release(IOpcPart *iface)
struct opc_part *part = impl_from_IOpcPart(iface);
ULONG refcount = InterlockedDecrement(&part->refcount);
TRACE("%p decreasing refcount to %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
{
......@@ -933,7 +933,7 @@ static ULONG WINAPI opc_part_set_AddRef(IOpcPartSet *iface)
struct opc_part_set *part_set = impl_from_IOpcPartSet(iface);
ULONG refcount = InterlockedIncrement(&part_set->refcount);
TRACE("%p increasing refcount to %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
......@@ -943,7 +943,7 @@ static ULONG WINAPI opc_part_set_Release(IOpcPartSet *iface)
struct opc_part_set *part_set = impl_from_IOpcPartSet(iface);
ULONG refcount = InterlockedDecrement(&part_set->refcount);
TRACE("%p decreasing refcount to %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
{
......@@ -1070,7 +1070,7 @@ static ULONG WINAPI opc_relationship_AddRef(IOpcRelationship *iface)
struct opc_relationship *relationship = impl_from_IOpcRelationship(iface);
ULONG refcount = InterlockedIncrement(&relationship->refcount);
TRACE("%p increasing refcount to %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
......@@ -1080,7 +1080,7 @@ static ULONG WINAPI opc_relationship_Release(IOpcRelationship *iface)
struct opc_relationship *relationship = impl_from_IOpcRelationship(iface);
ULONG refcount = InterlockedDecrement(&relationship->refcount);
TRACE("%p decreasing refcount to %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
{
......@@ -1253,7 +1253,7 @@ static ULONG WINAPI opc_relationship_set_AddRef(IOpcRelationshipSet *iface)
struct opc_relationship_set *relationship_set = impl_from_IOpcRelationshipSet(iface);
ULONG refcount = InterlockedIncrement(&relationship_set->refcount);
TRACE("%p increasing refcount to %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
......@@ -1263,7 +1263,7 @@ static ULONG WINAPI opc_relationship_set_Release(IOpcRelationshipSet *iface)
struct opc_relationship_set *relationship_set = impl_from_IOpcRelationshipSet(iface);
ULONG refcount = InterlockedDecrement(&relationship_set->refcount);
TRACE("%p decreasing refcount to %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
{
......@@ -1432,7 +1432,7 @@ static ULONG WINAPI opc_package_AddRef(IOpcPackage *iface)
struct opc_package *package = impl_from_IOpcPackage(iface);
ULONG refcount = InterlockedIncrement(&package->refcount);
TRACE("%p increasing refcount to %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
......@@ -1442,7 +1442,7 @@ static ULONG WINAPI opc_package_Release(IOpcPackage *iface)
struct opc_package *package = impl_from_IOpcPackage(iface);
ULONG refcount = InterlockedDecrement(&package->refcount);
TRACE("%p decreasing refcount to %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
{
......
dlls/opcservices/uri.c
View file @ 119f6e7b
......@@ -60,7 +60,7 @@ static ULONG WINAPI opc_uri_AddRef(IOpcPartUri *iface)
struct opc_uri *uri = impl_from_IOpcPartUri(iface);
ULONG refcount = InterlockedIncrement(&uri->refcount);
TRACE("%p increasing refcount to %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
......@@ -70,7 +70,7 @@ static ULONG WINAPI opc_uri_Release(IOpcPartUri *iface)
struct opc_uri *uri = impl_from_IOpcPartUri(iface);
ULONG refcount = InterlockedDecrement(&uri->refcount);
TRACE("%p decreasing refcount to %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
{
......@@ -90,7 +90,7 @@ static HRESULT WINAPI opc_uri_GetPropertyBSTR(IOpcPartUri *iface, Uri_PROPERTY p
{
struct opc_uri *uri = impl_from_IOpcPartUri(iface);
TRACE("iface %p, property %d, value %p, flags %#x.\n", iface, property, value, flags);
TRACE("iface %p, property %d, value %p, flags %#lx.\n", iface, property, value, flags);
return IUri_GetPropertyBSTR(uri->uri, property, value, flags);
}
......@@ -100,7 +100,7 @@ static HRESULT WINAPI opc_uri_GetPropertyLength(IOpcPartUri *iface, Uri_PROPERTY
{
struct opc_uri *uri = impl_from_IOpcPartUri(iface);
TRACE("iface %p, property %d, length %p, flags %#x.\n", iface, property, length, flags);
TRACE("iface %p, property %d, length %p, flags %#lx.\n", iface, property, length, flags);
return IUri_GetPropertyLength(uri->uri, property, length, flags);
}
......@@ -110,7 +110,7 @@ static HRESULT WINAPI opc_uri_GetPropertyDWORD(IOpcPartUri *iface, Uri_PROPERTY
{
struct opc_uri *uri = impl_from_IOpcPartUri(iface);
TRACE("iface %p, property %d, value %p, flags %#x.\n", iface, property, value, flags);
TRACE("iface %p, property %d, value %p, flags %#lx.\n", iface, property, value, flags);
return IUri_GetPropertyDWORD(uri->uri, property, value, flags);
}
......@@ -504,7 +504,7 @@ static IUri *opc_part_uri_get_rels_uri(IUri *uri)
lstrcatW(ret, relsextW);
if (FAILED(hr = CreateUri(ret, Uri_CREATE_ALLOW_RELATIVE, 0, &rels_uri)))
WARN("Failed to create rels uri, hr %#x.\n", hr);
WARN("Failed to create rels uri, hr %#lx.\n", hr);
heap_free(ret);
SysFreeString(path);
......@@ -544,7 +544,7 @@ static HRESULT opc_source_uri_create(struct opc_uri *uri, IOpcUri **out)
if (FAILED(hr = opc_part_uri_init(obj, NULL, uri->source_uri->is_part_uri, uri->source_uri->uri)))
{
WARN("Failed to init part uri, hr %#x.\n", hr);
WARN("Failed to init part uri, hr %#lx.\n", hr);
heap_free(obj);
return hr;
}
......@@ -566,7 +566,7 @@ HRESULT opc_part_uri_create(IUri *uri, struct opc_uri *source_uri, IOpcPartUri *
if (FAILED(hr = opc_part_uri_init(obj, source_uri, TRUE, uri)))
{
WARN("Failed to init part uri, hr %#x.\n", hr);
WARN("Failed to init part uri, hr %#lx.\n", hr);
heap_free(obj);
return hr;
}
......@@ -589,7 +589,7 @@ HRESULT opc_root_uri_create(IOpcUri **out)
if (FAILED(hr = CreateUri(L"/", Uri_CREATE_ALLOW_RELATIVE, 0, &uri)))
{
WARN("Failed to create rels uri, hr %#x.\n", hr);
WARN("Failed to create rels uri, hr %#lx.\n", hr);
heap_free(obj);
return hr;
}
......@@ -598,7 +598,7 @@ HRESULT opc_root_uri_create(IOpcUri **out)
IUri_Release(uri);
if (FAILED(hr))
{
WARN("Failed to init uri, hr %#x.\n", hr);
WARN("Failed to init uri, hr %#lx.\n", hr);
heap_free(uri);
return hr;
}
......
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