Skip to content

W
wine-winehq
Commit d9ade746 authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard
Browse files
Options

mfplat: Enable compilation with long types.

Signed-off-by: 's avatarEric Pouech <eric.pouech@gmail.com> Signed-off-by: 's avatarNikolay Sivov <nsivov@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 91b19177
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 52 deletions
dlls/mfplat/Makefile.in
View file @ d9ade746
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = mfplat.dll
IMPORTLIB = mfplat
IMPORTS = advapi32 ole32 mfuuid propsys rtworkq kernelbase
......
dlls/mfplat/buffer.c
View file @ d9ade746
......@@ -146,7 +146,7 @@ static ULONG WINAPI memory_buffer_AddRef(IMFMediaBuffer *iface)
struct buffer *buffer = impl_from_IMFMediaBuffer(iface);
ULONG refcount = InterlockedIncrement(&buffer->refcount);
TRACE("%p, refcount %u.\n", buffer, refcount);
TRACE("%p, refcount %lu.\n", buffer, refcount);
return refcount;
}
......@@ -156,7 +156,7 @@ static ULONG WINAPI memory_buffer_Release(IMFMediaBuffer *iface)
struct buffer *buffer = impl_from_IMFMediaBuffer(iface);
ULONG refcount = InterlockedDecrement(&buffer->refcount);
TRACE("%p, refcount %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
{
......@@ -221,7 +221,7 @@ static HRESULT WINAPI memory_buffer_SetCurrentLength(IMFMediaBuffer *iface, DWOR
{
struct buffer *buffer = impl_from_IMFMediaBuffer(iface);
TRACE("%p, %u.\n", iface, current_length);
TRACE("%p, %lu.\n", iface, current_length);
if (current_length > buffer->max_length)
return E_INVALIDARG;
......@@ -443,7 +443,7 @@ static HRESULT WINAPI d3d9_surface_buffer_SetCurrentLength(IMFMediaBuffer *iface
{
struct buffer *buffer = impl_from_IMFMediaBuffer(iface);
TRACE("%p, %u.\n", iface, current_length);
TRACE("%p, %lu.\n", iface, current_length);
buffer->current_length = current_length;
......@@ -595,14 +595,14 @@ static HRESULT WINAPI memory_2d_buffer_GetContiguousLength(IMF2DBuffer2 *iface,
static HRESULT WINAPI memory_2d_buffer_ContiguousCopyTo(IMF2DBuffer2 *iface, BYTE *dest_buffer, DWORD dest_length)
{
FIXME("%p, %p, %u.\n", iface, dest_buffer, dest_length);
FIXME("%p, %p, %lu.\n", iface, dest_buffer, dest_length);
return E_NOTIMPL;
}
static HRESULT WINAPI memory_2d_buffer_ContiguousCopyFrom(IMF2DBuffer2 *iface, const BYTE *src_buffer, DWORD src_length)
{
FIXME("%p, %p, %u.\n", iface, src_buffer, src_length);
FIXME("%p, %p, %lu.\n", iface, src_buffer, src_length);
return E_NOTIMPL;
}
......@@ -889,7 +889,7 @@ static HRESULT dxgi_surface_buffer_create_readback_texture(struct buffer *buffer
texture_desc.MiscFlags = 0;
texture_desc.MipLevels = 1;
if (FAILED(hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &buffer->dxgi_surface.rb_texture)))
WARN("Failed to create readback texture, hr %#x.\n", hr);
WARN("Failed to create readback texture, hr %#lx.\n", hr);
ID3D11Device_Release(device);
......@@ -914,7 +914,7 @@ static HRESULT dxgi_surface_buffer_map(struct buffer *buffer)
if (FAILED(hr = ID3D11DeviceContext_Map(immediate_context, (ID3D11Resource *)buffer->dxgi_surface.rb_texture,
0, D3D11_MAP_READ_WRITE, 0, &buffer->dxgi_surface.map_desc)))
{
WARN("Failed to map readback texture, hr %#x.\n", hr);
WARN("Failed to map readback texture, hr %#lx.\n", hr);
}
ID3D11DeviceContext_Release(immediate_context);
......@@ -1016,7 +1016,7 @@ static HRESULT WINAPI dxgi_surface_buffer_SetCurrentLength(IMFMediaBuffer *iface
{
struct buffer *buffer = impl_from_IMFMediaBuffer(iface);
TRACE("%p, %u.\n", iface, current_length);
TRACE("%p, %lu.\n", iface, current_length);
buffer->current_length = current_length;
......@@ -1438,7 +1438,7 @@ static HRESULT create_dxgi_surface_buffer(IUnknown *surface, unsigned int sub_re
if (FAILED(hr = IUnknown_QueryInterface(surface, &IID_ID3D11Texture2D, (void **)&texture)))
{
WARN("Failed to get texture interface, hr %#x.\n", hr);
WARN("Failed to get texture interface, hr %#lx.\n", hr);
return hr;
}
......@@ -1490,7 +1490,7 @@ static HRESULT create_dxgi_surface_buffer(IUnknown *surface, unsigned int sub_re
*/
HRESULT WINAPI MFCreateMemoryBuffer(DWORD max_length, IMFMediaBuffer **buffer)
{
TRACE("%u, %p.\n", max_length, buffer);
TRACE("%lu, %p.\n", max_length, buffer);
return create_1d_buffer(max_length, MF_1_BYTE_ALIGNMENT, buffer);
}
......@@ -1500,7 +1500,7 @@ HRESULT WINAPI MFCreateMemoryBuffer(DWORD max_length, IMFMediaBuffer **buffer)
*/
HRESULT WINAPI MFCreateAlignedMemoryBuffer(DWORD max_length, DWORD alignment, IMFMediaBuffer **buffer)
{
TRACE("%u, %u, %p.\n", max_length, alignment, buffer);
TRACE("%lu, %lu, %p.\n", max_length, alignment, buffer);
return create_1d_buffer(max_length, alignment, buffer);
}
......@@ -1510,7 +1510,7 @@ HRESULT WINAPI MFCreateAlignedMemoryBuffer(DWORD max_length, DWORD alignment, IM
*/
HRESULT WINAPI MFCreate2DMediaBuffer(DWORD width, DWORD height, DWORD fourcc, BOOL bottom_up, IMFMediaBuffer **buffer)
{
TRACE("%u, %u, %s, %d, %p.\n", width, height, debugstr_fourcc(fourcc), bottom_up, buffer);
TRACE("%lu, %lu, %s, %d, %p.\n", width, height, debugstr_fourcc(fourcc), bottom_up, buffer);
return create_2d_buffer(width, height, fourcc, bottom_up, buffer);
}
......@@ -1558,7 +1558,7 @@ HRESULT WINAPI MFCreateMediaBufferFromMediaType(IMFMediaType *media_type, LONGLO
HRESULT hr;
GUID major;
TRACE("%p, %s, %u, %u, %p.\n", media_type, debugstr_time(duration), min_length, alignment, buffer);
TRACE("%p, %s, %lu, %lu, %p.\n", media_type, debugstr_time(duration), min_length, alignment, buffer);
if (!media_type)
return E_INVALIDARG;
......
dlls/mfplat/mediatype.c
View file @ d9ade746
......@@ -138,7 +138,7 @@ static ULONG WINAPI mediatype_AddRef(IMFMediaType *iface)
struct media_type *media_type = impl_from_IMFMediaType(iface);
ULONG refcount = InterlockedIncrement(&media_type->attributes.ref);
TRACE("%p, refcount %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
......@@ -148,7 +148,7 @@ static ULONG WINAPI mediatype_Release(IMFMediaType *iface)
struct media_type *media_type = impl_from_IMFMediaType(iface);
ULONG refcount = InterlockedDecrement(&media_type->attributes.ref);
TRACE("%p, refcount %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
{
......@@ -977,7 +977,7 @@ static const MFVIDEOFORMAT * WINAPI video_mediatype_GetVideoFormat(IMFVideoMedia
CoTaskMemFree(media_type->video_format);
if (FAILED(hr = MFCreateMFVideoFormatFromMFMediaType(&media_type->IMFMediaType_iface, &media_type->video_format, &size)))
WARN("Failed to create format description, hr %#x.\n", hr);
WARN("Failed to create format description, hr %#lx.\n", hr);
return media_type->video_format;
}
......@@ -985,7 +985,7 @@ static const MFVIDEOFORMAT * WINAPI video_mediatype_GetVideoFormat(IMFVideoMedia
static HRESULT WINAPI video_mediatype_GetVideoRepresentation(IMFVideoMediaType *iface, GUID representation,
void **data, LONG stride)
{
FIXME("%p, %s, %p, %d.\n", iface, debugstr_guid(&representation), data, stride);
FIXME("%p, %s, %p, %ld.\n", iface, debugstr_guid(&representation), data, stride);
return E_NOTIMPL;
}
......@@ -1379,7 +1379,7 @@ static const WAVEFORMATEX * WINAPI audio_mediatype_GetAudioFormat(IMFAudioMediaT
if (FAILED(hr = MFCreateWaveFormatExFromMFMediaType(&media_type->IMFMediaType_iface, &media_type->audio_format,
&size, MFWaveFormatExConvertFlag_Normal)))
{
WARN("Failed to create wave format description, hr %#x.\n", hr);
WARN("Failed to create wave format description, hr %#lx.\n", hr);
}
return media_type->audio_format;
......@@ -1496,7 +1496,7 @@ static ULONG WINAPI stream_descriptor_AddRef(IMFStreamDescriptor *iface)
struct stream_desc *stream_desc = impl_from_IMFStreamDescriptor(iface);
ULONG refcount = InterlockedIncrement(&stream_desc->attributes.ref);
TRACE("%p, refcount %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
......@@ -1507,7 +1507,7 @@ static ULONG WINAPI stream_descriptor_Release(IMFStreamDescriptor *iface)
ULONG refcount = InterlockedDecrement(&stream_desc->attributes.ref);
unsigned int i;
TRACE("%p, refcount %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
{
......@@ -1953,7 +1953,7 @@ static HRESULT WINAPI mediatype_handler_GetMediaTypeByIndex(IMFMediaTypeHandler
{
struct stream_desc *stream_desc = impl_from_IMFMediaTypeHandler(iface);
TRACE("%p, %u, %p.\n", iface, index, type);
TRACE("%p, %lu, %p.\n", iface, index, type);
if (index >= stream_desc->media_types_count)
return MF_E_NO_MORE_TYPES;
......@@ -2044,7 +2044,7 @@ HRESULT WINAPI MFCreateStreamDescriptor(DWORD identifier, DWORD count,
unsigned int i;
HRESULT hr;
TRACE("%d, %d, %p, %p.\n", identifier, count, types, descriptor);
TRACE("%ld, %ld, %p, %p.\n", identifier, count, types, descriptor);
if (!count)
return E_INVALIDARG;
......@@ -2102,7 +2102,7 @@ static ULONG WINAPI presentation_descriptor_AddRef(IMFPresentationDescriptor *if
struct presentation_desc *presentation_desc = impl_from_IMFPresentationDescriptor(iface);
ULONG refcount = InterlockedIncrement(&presentation_desc->attributes.ref);
TRACE("%p, refcount %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
......@@ -2113,7 +2113,7 @@ static ULONG WINAPI presentation_descriptor_Release(IMFPresentationDescriptor *i
ULONG refcount = InterlockedDecrement(&presentation_desc->attributes.ref);
unsigned int i;
TRACE("%p, refcount %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
{
......@@ -2431,7 +2431,7 @@ static HRESULT WINAPI presentation_descriptor_GetStreamDescriptorByIndex(IMFPres
{
struct presentation_desc *presentation_desc = impl_from_IMFPresentationDescriptor(iface);
TRACE("%p, %u, %p, %p.\n", iface, index, selected, descriptor);
TRACE("%p, %lu, %p, %p.\n", iface, index, selected, descriptor);
if (index >= presentation_desc->count)
return E_INVALIDARG;
......@@ -2450,7 +2450,7 @@ static HRESULT WINAPI presentation_descriptor_SelectStream(IMFPresentationDescri
{
struct presentation_desc *presentation_desc = impl_from_IMFPresentationDescriptor(iface);
TRACE("%p, %u.\n", iface, index);
TRACE("%p, %lu.\n", iface, index);
if (index >= presentation_desc->count)
return E_INVALIDARG;
......@@ -2466,7 +2466,7 @@ static HRESULT WINAPI presentation_descriptor_DeselectStream(IMFPresentationDesc
{
struct presentation_desc *presentation_desc = impl_from_IMFPresentationDescriptor(iface);
TRACE("%p, %u.\n", iface, index);
TRACE("%p, %lu.\n", iface, index);
if (index >= presentation_desc->count)
return E_INVALIDARG;
......@@ -2578,7 +2578,7 @@ HRESULT WINAPI MFCreatePresentationDescriptor(DWORD count, IMFStreamDescriptor *
unsigned int i;
HRESULT hr;
TRACE("%u, %p, %p.\n", count, descriptors, out);
TRACE("%lu, %p, %p.\n", count, descriptors, out);
if (!count)
return E_INVALIDARG;
......@@ -2683,7 +2683,7 @@ HRESULT WINAPI MFGetStrideForBitmapInfoHeader(DWORD fourcc, DWORD width, LONG *s
struct uncompressed_video_format *format;
GUID subtype;
TRACE("%s, %u, %p.\n", debugstr_fourcc(fourcc), width, stride);
TRACE("%s, %lu, %p.\n", debugstr_fourcc(fourcc), width, stride);
memcpy(&subtype, &MFVideoFormat_Base, sizeof(subtype));
subtype.Data1 = fourcc;
......@@ -2750,7 +2750,7 @@ HRESULT WINAPI MFGetPlaneSize(DWORD fourcc, DWORD width, DWORD height, DWORD *si
unsigned int stride;
GUID subtype;
TRACE("%s, %u, %u, %p.\n", debugstr_fourcc(fourcc), width, height, size);
TRACE("%s, %lu, %lu, %p.\n", debugstr_fourcc(fourcc), width, height, size);
memcpy(&subtype, &MFVideoFormat_Base, sizeof(subtype));
subtype.Data1 = fourcc;
......@@ -3511,7 +3511,7 @@ HRESULT WINAPI MFInitVideoFormat_RGB(MFVIDEOFORMAT *format, DWORD width, DWORD h
{
unsigned int transfer_function;
TRACE("%p, %u, %u, %#x.\n", format, width, height, d3dformat);
TRACE("%p, %lu, %lu, %#lx.\n", format, width, height, d3dformat);
if (!format)
return E_INVALIDARG;
......
dlls/mfplat/mfplat_private.h
View file @ d9ade746
......@@ -128,7 +128,7 @@ static inline const char *debugstr_propvar(const PROPVARIANT *v)
case VT_NULL:
return wine_dbg_sprintf("%p {VT_NULL}", v);
case VT_UI4:
return wine_dbg_sprintf("%p {VT_UI4: %d}", v, v->ulVal);
return wine_dbg_sprintf("%p {VT_UI4: %ld}", v, v->ulVal);
case VT_UI8:
return wine_dbg_sprintf("%p {VT_UI8: %s}", v, wine_dbgstr_longlong(v->uhVal.QuadPart));
case VT_I8:
......@@ -178,7 +178,7 @@ static inline const char *debugstr_fourcc(DWORD format)
return wine_dbg_sprintf("%s", wine_dbgstr_an(formats[i].name, -1));
}
return wine_dbg_sprintf("%#x", format);
return wine_dbg_sprintf("%#lx", format);
}
return wine_dbgstr_an((char *)&format, 4);
......
dlls/mfplat/queue.c
View file @ d9ade746
......@@ -41,7 +41,7 @@ HRESULT WINAPI MFPutWorkItem(DWORD queue, IMFAsyncCallback *callback, IUnknown *
IRtwqAsyncResult *result;
HRESULT hr;
TRACE("%#x, %p, %p.\n", queue, callback, state);
TRACE("%#lx, %p, %p.\n", queue, callback, state);
if (FAILED(hr = RtwqCreateAsyncResult(NULL, (IRtwqAsyncCallback *)callback, state, &result)))
return hr;
......@@ -61,7 +61,7 @@ HRESULT WINAPI MFPutWorkItem2(DWORD queue, LONG priority, IMFAsyncCallback *call
IRtwqAsyncResult *result;
HRESULT hr;
TRACE("%#x, %d, %p, %p.\n", queue, priority, callback, state);
TRACE("%#lx, %ld, %p, %p.\n", queue, priority, callback, state);
if (FAILED(hr = RtwqCreateAsyncResult(NULL, (IRtwqAsyncCallback *)callback, state, &result)))
return hr;
......@@ -78,7 +78,7 @@ HRESULT WINAPI MFPutWorkItem2(DWORD queue, LONG priority, IMFAsyncCallback *call
*/
HRESULT WINAPI MFPutWorkItemEx(DWORD queue, IMFAsyncResult *result)
{
TRACE("%#x, %p\n", queue, result);
TRACE("%#lx, %p\n", queue, result);
return RtwqPutWorkItem(queue, 0, (IRtwqAsyncResult *)result);
}
......@@ -88,7 +88,7 @@ HRESULT WINAPI MFPutWorkItemEx(DWORD queue, IMFAsyncResult *result)
*/
HRESULT WINAPI MFPutWorkItemEx2(DWORD queue, LONG priority, IMFAsyncResult *result)
{
TRACE("%#x, %d, %p\n", queue, priority, result);
TRACE("%#lx, %ld, %p\n", queue, priority, result);
return RtwqPutWorkItem(queue, priority, (IRtwqAsyncResult *)result);
}
......
dlls/mfplat/sample.c
View file @ d9ade746
......@@ -150,7 +150,7 @@ static ULONG WINAPI sample_AddRef(IMFSample *iface)
struct sample *sample = impl_from_IMFSample(iface);
ULONG refcount = InterlockedIncrement(&sample->attributes.ref);
TRACE("%p, refcount %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
......@@ -171,7 +171,7 @@ static ULONG WINAPI sample_Release(IMFSample *iface)
struct sample *sample = impl_from_IMFSample(iface);
ULONG refcount = InterlockedDecrement(&sample->attributes.ref);
TRACE("%p, refcount %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
release_sample_object(sample);
......@@ -194,14 +194,14 @@ static ULONG WINAPI sample_tracked_Release(IMFSample *iface)
/* Call could fail if queue system is not initialized, it's not critical. */
if (FAILED(hr = RtwqInvokeCallback(tracked_result)))
WARN("Failed to invoke tracking callback, hr %#x.\n", hr);
WARN("Failed to invoke tracking callback, hr %#lx.\n", hr);
IRtwqAsyncResult_Release(tracked_result);
}
LeaveCriticalSection(&sample->attributes.cs);
refcount = InterlockedDecrement(&sample->attributes.ref);
TRACE("%p, refcount %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
release_sample_object(sample);
......@@ -497,7 +497,7 @@ static HRESULT WINAPI sample_SetSampleFlags(IMFSample *iface, DWORD flags)
{
struct sample *sample = impl_from_IMFSample(iface);
TRACE("%p, %#x.\n", iface, flags);
TRACE("%p, %#lx.\n", iface, flags);
EnterCriticalSection(&sample->attributes.cs);
sample->flags = flags;
......@@ -589,7 +589,7 @@ static HRESULT WINAPI sample_GetBufferByIndex(IMFSample *iface, DWORD index, IMF
struct sample *sample = impl_from_IMFSample(iface);
HRESULT hr = S_OK;
TRACE("%p, %u, %p.\n", iface, index, buffer);
TRACE("%p, %lu, %p.\n", iface, index, buffer);
EnterCriticalSection(&sample->attributes.cs);
if (index < sample->buffer_count)
......@@ -741,7 +741,7 @@ static HRESULT WINAPI sample_RemoveBufferByIndex(IMFSample *iface, DWORD index)
struct sample *sample = impl_from_IMFSample(iface);
HRESULT hr = S_OK;
TRACE("%p, %u.\n", iface, index);
TRACE("%p, %lu.\n", iface, index);
EnterCriticalSection(&sample->attributes.cs);
if (index < sample->buffer_count)
......@@ -1097,7 +1097,7 @@ static ULONG WINAPI sample_allocator_AddRef(IMFVideoSampleAllocatorEx *iface)
struct sample_allocator *allocator = impl_from_IMFVideoSampleAllocatorEx(iface);
ULONG refcount = InterlockedIncrement(&allocator->refcount);
TRACE("%p, refcount %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
......@@ -1167,7 +1167,7 @@ static ULONG WINAPI sample_allocator_Release(IMFVideoSampleAllocatorEx *iface)
struct sample_allocator *allocator = impl_from_IMFVideoSampleAllocatorEx(iface);
ULONG refcount = InterlockedDecrement(&allocator->refcount);
TRACE("%p, refcount %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
{
......@@ -1265,7 +1265,7 @@ static HRESULT sample_allocator_get_surface_service(struct sample_allocator *all
if (FAILED(hr = IDirect3DDeviceManager9_GetVideoService(allocator->d3d9_device_manager, service->hdevice,
&IID_IDirectXVideoProcessorService, (void **)&service->dxva_service)))
{
WARN("Failed to get DXVA processor service, hr %#x.\n", hr);
WARN("Failed to get DXVA processor service, hr %#lx.\n", hr);
IDirect3DDeviceManager9_CloseDeviceHandle(allocator->d3d9_device_manager, service->hdevice);
}
}
......@@ -1277,7 +1277,7 @@ static HRESULT sample_allocator_get_surface_service(struct sample_allocator *all
if (FAILED(hr = IMFDXGIDeviceManager_GetVideoService(allocator->dxgi_device_manager, service->hdevice,
&IID_ID3D11Device, (void **)&service->d3d11_device)))
{
WARN("Failed to get D3D11 device, hr %#x.\n", hr);
WARN("Failed to get D3D11 device, hr %#lx.\n", hr);
IMFDXGIDeviceManager_CloseDeviceHandle(allocator->dxgi_device_manager, service->hdevice);
}
}
......@@ -1487,7 +1487,7 @@ static HRESULT WINAPI sample_allocator_InitializeSampleAllocator(IMFVideoSampleA
struct sample_allocator *allocator = impl_from_IMFVideoSampleAllocatorEx(iface);
HRESULT hr;
TRACE("%p, %u, %p.\n", iface, sample_count, media_type);
TRACE("%p, %lu, %p.\n", iface, sample_count, media_type);
if (!sample_count)
return E_INVALIDARG;
......@@ -1584,7 +1584,7 @@ static HRESULT WINAPI sample_allocator_InitializeSampleAllocatorEx(IMFVideoSampl
struct sample_allocator *allocator = impl_from_IMFVideoSampleAllocatorEx(iface);
HRESULT hr;
TRACE("%p, %u, %u, %p, %p.\n", iface, initial_sample_count, max_sample_count, attributes, media_type);
TRACE("%p, %lu, %lu, %p, %p.\n", iface, initial_sample_count, max_sample_count, attributes, media_type);
EnterCriticalSection(&allocator->cs);
......
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