Skip to content

W
wine-cw
Commit e091d5e8 authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard
Browse files
Options

evr: Fix long types warnings.

Signed-off-by: 's avatarNikolay Sivov <nsivov@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 11ddaf06
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 73 deletions
dlls/evr/Makefile.in
View file @ e091d5e8
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = evr.dll
IMPORTLIB = evr
IMPORTS = mfuuid strmiids strmbase uuid dxguid ole32 oleaut32 user32 d3d9 dxva2
......
dlls/evr/evr.c
View file @ e091d5e8
......@@ -109,7 +109,7 @@ static HRESULT WINAPI filter_config_SetNumberOfStreams(IEVRFilterConfig *iface,
{
struct evr *filter = impl_from_IEVRFilterConfig(iface);
FIXME("filter %p, count %u, stub!\n", filter, count);
FIXME("filter %p, count %lu, stub!\n", filter, count);
return E_NOTIMPL;
}
......
dlls/evr/presenter.c
View file @ e091d5e8
......@@ -320,7 +320,7 @@ static HRESULT video_presenter_set_media_type(struct video_presenter *presenter,
presenter->frame_time_threshold = frametime / 4;
}
else
WARN("Failed to initialize sample allocator, hr %#x.\n", hr);
WARN("Failed to initialize sample allocator, hr %#lx.\n", hr);
return hr;
}
......@@ -387,7 +387,7 @@ static HRESULT video_presenter_invalidate_media_type(struct video_presenter *pre
/* FIXME: check that d3d device supports this format */
if (FAILED(hr = IMFMediaType_CopyAllItems(candidate_type, (IMFAttributes *)media_type)))
WARN("Failed to clone a media type, hr %#x.\n", hr);
WARN("Failed to clone a media type, hr %#lx.\n", hr);
IMFMediaType_Release(candidate_type);
hr = video_presenter_configure_output_type(presenter, &aperture, media_type);
......@@ -490,13 +490,13 @@ static void video_presenter_sample_present(struct video_presenter *presenter, IM
if (FAILED(hr = video_presenter_get_sample_surface(sample, &surface)))
{
WARN("Failed to get sample surface, hr %#x.\n", hr);
WARN("Failed to get sample surface, hr %#lx.\n", hr);
return;
}
if (FAILED(hr = IDirect3DSwapChain9_GetBackBuffer(presenter->swapchain, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer)))
{
WARN("Failed to get a backbuffer, hr %#x.\n", hr);
WARN("Failed to get a backbuffer, hr %#lx.\n", hr);
IDirect3DSurface9_Release(surface);
return;
}
......@@ -603,7 +603,7 @@ static HRESULT video_presenter_process_input(struct video_presenter *presenter)
if (FAILED(hr = IMFVideoSampleAllocator_AllocateSample(presenter->allocator, &sample)))
{
WARN("Failed to allocate a sample, hr %#x.\n", hr);
WARN("Failed to allocate a sample, hr %#lx.\n", hr);
break;
}
......@@ -722,7 +722,7 @@ static HRESULT video_presenter_start_streaming(struct video_presenter *presenter
CloseHandle(presenter->thread.ready_event);
presenter->thread.ready_event = NULL;
TRACE("Started streaming thread, tid %#x.\n", presenter->thread.tid);
TRACE("Started streaming thread, tid %#lx.\n", presenter->thread.tid);
return S_OK;
}
......@@ -737,7 +737,7 @@ static HRESULT video_presenter_end_streaming(struct video_presenter *presenter)
WaitForSingleObject(presenter->thread.hthread, INFINITE);
CloseHandle(presenter->thread.hthread);
TRACE("Terminated streaming thread tid %#x.\n", presenter->thread.tid);
TRACE("Terminated streaming thread tid %#lx.\n", presenter->thread.tid);
memset(&presenter->thread, 0, sizeof(presenter->thread));
video_presenter_set_allocator_callback(presenter, NULL);
......@@ -816,7 +816,7 @@ static ULONG WINAPI video_presenter_inner_AddRef(IUnknown *iface)
struct video_presenter *presenter = impl_from_IUnknown(iface);
ULONG refcount = InterlockedIncrement(&presenter->refcount);
TRACE("%p, refcount %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
......@@ -839,7 +839,7 @@ static ULONG WINAPI video_presenter_inner_Release(IUnknown *iface)
struct video_presenter *presenter = impl_from_IUnknown(iface);
ULONG refcount = InterlockedDecrement(&presenter->refcount);
TRACE("%p, refcount %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
{
......@@ -952,7 +952,7 @@ static HRESULT WINAPI video_presenter_ProcessMessage(IMFVideoPresenter *iface, M
struct video_presenter *presenter = impl_from_IMFVideoPresenter(iface);
HRESULT hr;
TRACE("%p, %d, %lu.\n", iface, message, param);
TRACE("%p, %d, %Iu.\n", iface, message, param);
EnterCriticalSection(&presenter->cs);
......@@ -1095,7 +1095,7 @@ static void video_presenter_set_mixer_rect(struct video_presenter *presenter)
if (FAILED(hr = IMFAttributes_SetBlob(attributes, &VIDEO_ZOOM_RECT, (const UINT8 *)&presenter->src_rect,
sizeof(presenter->src_rect))))
{
WARN("Failed to set zoom rectangle attribute, hr %#x.\n", hr);
WARN("Failed to set zoom rectangle attribute, hr %#lx.\n", hr);
}
IMFAttributes_Release(attributes);
}
......@@ -1112,7 +1112,7 @@ static HRESULT video_presenter_attach_mixer(struct video_presenter *presenter, I
if (FAILED(hr = IMFTopologyServiceLookup_LookupService(service_lookup, MF_SERVICE_LOOKUP_GLOBAL, 0,
&MR_VIDEO_MIXER_SERVICE, &IID_IMFTransform, (void **)&presenter->mixer, &count)))
{
WARN("Failed to get mixer interface, hr %#x.\n", hr);
WARN("Failed to get mixer interface, hr %#lx.\n", hr);
return hr;
}
......@@ -1174,7 +1174,7 @@ static HRESULT WINAPI video_presenter_service_client_InitServicePointers(IMFTopo
if (FAILED(hr = IMFTopologyServiceLookup_LookupService(service_lookup, MF_SERVICE_LOOKUP_GLOBAL, 0,
&MR_VIDEO_RENDER_SERVICE, &IID_IMediaEventSink, (void **)&presenter->event_sink, &count)))
{
WARN("Failed to get renderer event sink, hr %#x.\n", hr);
WARN("Failed to get renderer event sink, hr %#lx.\n", hr);
}
}
......@@ -1350,7 +1350,7 @@ static HRESULT WINAPI video_presenter_control_SetAspectRatioMode(IMFVideoDisplay
{
struct video_presenter *presenter = impl_from_IMFVideoDisplayControl(iface);
TRACE("%p, %#x.\n", iface, mode);
TRACE("%p, %#lx.\n", iface, mode);
if (mode & ~MFVideoARMode_Mask)
return E_INVALIDARG;
......@@ -1468,7 +1468,7 @@ static HRESULT WINAPI video_presenter_control_GetCurrentImage(IMFVideoDisplayCon
static HRESULT WINAPI video_presenter_control_SetBorderColor(IMFVideoDisplayControl *iface, COLORREF color)
{
FIXME("%p, %#x.\n", iface, color);
FIXME("%p, %#lx.\n", iface, color);
return E_NOTIMPL;
}
......@@ -1482,7 +1482,7 @@ static HRESULT WINAPI video_presenter_control_GetBorderColor(IMFVideoDisplayCont
static HRESULT WINAPI video_presenter_control_SetRenderingPrefs(IMFVideoDisplayControl *iface, DWORD flags)
{
FIXME("%p, %#x.\n", iface, flags);
FIXME("%p, %#lx.\n", iface, flags);
return E_NOTIMPL;
}
......@@ -1654,7 +1654,7 @@ static ULONG WINAPI video_presenter_position_mapper_Release(IMFVideoPositionMapp
static HRESULT WINAPI video_presenter_position_mapper_MapOutputCoordinateToInputStream(IMFVideoPositionMapper *iface,
float x_out, float y_out, DWORD output_stream, DWORD input_stream, float *x_in, float *y_in)
{
FIXME("%p, %f, %f, %u, %u, %p, %p.\n", iface, x_out, y_out, output_stream, input_stream, x_in, y_in);
FIXME("%p, %f, %f, %lu, %lu, %p, %p.\n", iface, x_out, y_out, output_stream, input_stream, x_in, y_in);
return E_NOTIMPL;
}
......@@ -2028,14 +2028,14 @@ static HRESULT video_presenter_init_d3d(struct video_presenter *presenter)
if (FAILED(hr))
{
WARN("Failed to create d3d device, hr %#x.\n", hr);
WARN("Failed to create d3d device, hr %#lx.\n", hr);
return hr;
}
hr = IDirect3DDeviceManager9_ResetDevice(presenter->device_manager, device, presenter->reset_token);
IDirect3DDevice9_Release(device);
if (FAILED(hr))
WARN("Failed to set new device for the manager, hr %#x.\n", hr);
WARN("Failed to set new device for the manager, hr %#lx.\n", hr);
if (SUCCEEDED(hr = MFCreateVideoSampleAllocator(&IID_IMFVideoSampleAllocator, (void **)&presenter->allocator)))
{
......@@ -2080,7 +2080,7 @@ HRESULT evr_presenter_create(IUnknown *outer, void **out)
if (FAILED(hr = video_presenter_init_d3d(object)))
{
WARN("Failed to initialize d3d device, hr %#x.\n", hr);
WARN("Failed to initialize d3d device, hr %#lx.\n", hr);
goto failed;
}
......
dlls/evr/sample.c
View file @ e091d5e8
......@@ -147,7 +147,7 @@ static ULONG WINAPI tracked_async_result_AddRef(IMFAsyncResult *iface)
struct tracked_async_result *result = impl_from_IMFAsyncResult(iface);
ULONG refcount = InterlockedIncrement(&result->refcount);
TRACE("%p, %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
......@@ -157,7 +157,7 @@ static ULONG WINAPI tracked_async_result_Release(IMFAsyncResult *iface)
struct tracked_async_result *result = impl_from_IMFAsyncResult(iface);
ULONG refcount = InterlockedDecrement(&result->refcount);
TRACE("%p, %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
{
......@@ -201,7 +201,7 @@ static HRESULT WINAPI tracked_async_result_SetStatus(IMFAsyncResult *iface, HRES
{
struct tracked_async_result *result = impl_from_IMFAsyncResult(iface);
TRACE("%p, %#x.\n", iface, status);
TRACE("%p, %#lx.\n", iface, status);
result->result.hrStatusResult = status;
......@@ -351,7 +351,7 @@ static void video_sample_create_tracking_thread(void)
WaitForSingleObject(ready_event, INFINITE);
CloseHandle(ready_event);
TRACE("Create tracking thread %#x.\n", tracking_thread.tid);
TRACE("Create tracking thread %#lx.\n", tracking_thread.tid);
}
LeaveCriticalSection(&tracking_thread_cs);
......@@ -450,7 +450,7 @@ static ULONG WINAPI sample_allocator_AddRef(IMFVideoSampleAllocator *iface)
struct sample_allocator *allocator = impl_from_IMFVideoSampleAllocator(iface);
ULONG refcount = InterlockedIncrement(&allocator->refcount);
TRACE("%p, refcount %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
......@@ -478,7 +478,7 @@ static ULONG WINAPI sample_allocator_Release(IMFVideoSampleAllocator *iface)
struct sample_allocator *allocator = impl_from_IMFVideoSampleAllocator(iface);
ULONG refcount = InterlockedDecrement(&allocator->refcount);
TRACE("%p, refcount %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
{
......@@ -575,7 +575,7 @@ static HRESULT sample_allocator_create_samples(struct sample_allocator *allocato
if (FAILED(hr))
{
WARN("Failed to get processor service, %#x.\n", hr);
WARN("Failed to get processor service, %#lx.\n", hr);
return hr;
}
}
......@@ -638,7 +638,7 @@ static HRESULT WINAPI sample_allocator_InitializeSampleAllocator(IMFVideoSampleA
struct sample_allocator *allocator = impl_from_IMFVideoSampleAllocator(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)
sample_count = 1;
......@@ -912,7 +912,7 @@ static ULONG WINAPI video_sample_AddRef(IMFSample *iface)
struct video_sample *sample = impl_from_IMFSample(iface);
ULONG refcount = InterlockedIncrement(&sample->refcount);
TRACE("%p, refcount %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
......@@ -934,7 +934,7 @@ static ULONG WINAPI video_sample_Release(IMFSample *iface)
refcount = InterlockedDecrement(&sample->refcount);
TRACE("%p, refcount %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
{
......@@ -1232,7 +1232,7 @@ static HRESULT WINAPI video_sample_SetSampleFlags(IMFSample *iface, DWORD flags)
{
struct video_sample *sample = impl_from_IMFSample(iface);
TRACE("%p, %#x.\n", iface, flags);
TRACE("%p, %#lx.\n", iface, flags);
return IMFSample_SetSampleFlags(sample->sample, flags);
}
......@@ -1312,7 +1312,7 @@ static HRESULT WINAPI video_sample_GetBufferByIndex(IMFSample *iface, DWORD inde
{
struct video_sample *sample = impl_from_IMFSample(iface);
TRACE("%p, %u, %p.\n", iface, index, buffer);
TRACE("%p, %lu, %p.\n", iface, index, buffer);
return IMFSample_GetBufferByIndex(sample->sample, index, buffer);
}
......@@ -1337,7 +1337,7 @@ static HRESULT WINAPI video_sample_RemoveBufferByIndex(IMFSample *iface, DWORD i
{
struct video_sample *sample = impl_from_IMFSample(iface);
TRACE("%p, %u.\n", iface, index);
TRACE("%p, %lu.\n", iface, index);
return IMFSample_RemoveBufferByIndex(sample->sample, index);
}
......@@ -1585,7 +1585,7 @@ static ULONG WINAPI surface_buffer_AddRef(IMFMediaBuffer *iface)
struct surface_buffer *buffer = impl_from_IMFMediaBuffer(iface);
ULONG refcount = InterlockedIncrement(&buffer->refcount);
TRACE("%p, refcount %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
......@@ -1595,7 +1595,7 @@ static ULONG WINAPI surface_buffer_Release(IMFMediaBuffer *iface)
struct surface_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)
{
......
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