[PATCH 1/2] winegstreamer: Build without -DWINE_NO_LONG_TYPES.
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/Makefile.in | 1 - dlls/winegstreamer/audioconvert.c | 44 ++++----- dlls/winegstreamer/media_source.c | 60 ++++++------- dlls/winegstreamer/mfplat.c | 34 +++---- dlls/winegstreamer/quartz_parser.c | 36 ++++---- dlls/winegstreamer/wm_asyncreader.c | 133 +++++++++++++++++----------- dlls/winegstreamer/wm_reader.c | 74 ++++++++-------- dlls/winegstreamer/wm_syncreader.c | 24 ++--- dlls/winegstreamer/wma_decoder.c | 72 +++++++-------- 9 files changed, 253 insertions(+), 225 deletions(-) diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in index 1706effbd20..c53e914e246 100644 --- a/dlls/winegstreamer/Makefile.in +++ b/dlls/winegstreamer/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winegstreamer.dll UNIXLIB = winegstreamer.so IMPORTLIB = winegstreamer diff --git a/dlls/winegstreamer/audioconvert.c b/dlls/winegstreamer/audioconvert.c index 33350fb3566..d5723cdf58f 100644 --- a/dlls/winegstreamer/audioconvert.c +++ b/dlls/winegstreamer/audioconvert.c @@ -64,7 +64,7 @@ static ULONG WINAPI audio_converter_AddRef(IMFTransform *iface) struct audio_converter *transform = impl_audio_converter_from_IMFTransform(iface); ULONG refcount = InterlockedIncrement(&transform->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -74,7 +74,7 @@ static ULONG WINAPI audio_converter_Release(IMFTransform *iface) struct audio_converter *transform = impl_audio_converter_from_IMFTransform(iface); ULONG refcount = InterlockedDecrement(&transform->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -108,21 +108,21 @@ static HRESULT WINAPI audio_converter_GetStreamCount(IMFTransform *iface, DWORD static HRESULT WINAPI audio_converter_GetStreamIDs(IMFTransform *iface, DWORD input_size, DWORD *inputs, DWORD output_size, DWORD *outputs) { - TRACE("%p %u %p %u %p.\n", iface, input_size, inputs, output_size, outputs); + TRACE("%p, %lu, %p, %lu, %p.\n", iface, input_size, inputs, output_size, outputs); return E_NOTIMPL; } static HRESULT WINAPI audio_converter_GetInputStreamInfo(IMFTransform *iface, DWORD id, MFT_INPUT_STREAM_INFO *info) { - FIXME("%p %u %p.\n", iface, id, info); + FIXME("%p, %lu, %p.\n", iface, id, info); return E_NOTIMPL; } static HRESULT WINAPI audio_converter_GetOutputStreamInfo(IMFTransform *iface, DWORD id, MFT_OUTPUT_STREAM_INFO *info) { - FIXME("%p %u %p.\n", iface, id, info); + FIXME("%p. %lu, %p.\n", iface, id, info); return E_NOTIMPL; } @@ -137,7 +137,7 @@ static HRESULT WINAPI audio_converter_GetAttributes(IMFTransform *iface, IMFAttr static HRESULT WINAPI audio_converter_GetInputStreamAttributes(IMFTransform *iface, DWORD id, IMFAttributes **attributes) { - FIXME("%p, %u, %p.\n", iface, id, attributes); + FIXME("%p, %lu, %p.\n", iface, id, attributes); return E_NOTIMPL; } @@ -145,21 +145,21 @@ static HRESULT WINAPI audio_converter_GetInputStreamAttributes(IMFTransform *ifa static HRESULT WINAPI audio_converter_GetOutputStreamAttributes(IMFTransform *iface, DWORD id, IMFAttributes **attributes) { - FIXME("%p, %u, %p.\n", iface, id, attributes); + FIXME("%p, %lu, %p.\n", iface, id, attributes); return E_NOTIMPL; } static HRESULT WINAPI audio_converter_DeleteInputStream(IMFTransform *iface, DWORD id) { - TRACE("%p, %u.\n", iface, id); + TRACE("%p, %lu.\n", iface, id); return E_NOTIMPL; } static HRESULT WINAPI audio_converter_AddInputStreams(IMFTransform *iface, DWORD streams, DWORD *ids) { - TRACE("%p, %u, %p.\n", iface, streams, ids); + TRACE("%p, %lu, %p.\n", iface, streams, ids); return E_NOTIMPL; } @@ -170,7 +170,7 @@ static HRESULT WINAPI audio_converter_GetInputAvailableType(IMFTransform *iface, IMFMediaType *ret; HRESULT hr; - TRACE("%p, %u, %u, %p.\n", iface, id, index, type); + TRACE("%p, %lu, %lu, %p.\n", iface, id, index, type); if (id != 0) return MF_E_INVALIDSTREAMNUMBER; @@ -222,7 +222,7 @@ static HRESULT WINAPI audio_converter_GetOutputAvailableType(IMFTransform *iface const GUID *subtype; DWORD rate, channels, bps; - TRACE("%p, %u, %u, %p.\n", iface, id, index, type); + TRACE("%p, %lu, %lu, %p.\n", iface, id, index, type); if (id != 0) return MF_E_INVALIDSTREAMNUMBER; @@ -272,12 +272,12 @@ fail: static HRESULT WINAPI audio_converter_SetInputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) { GUID major_type, subtype; - DWORD unused; + UINT32 unused; HRESULT hr; struct audio_converter *converter = impl_audio_converter_from_IMFTransform(iface); - TRACE("%p, %u, %p, %#x.\n", iface, id, type, flags); + TRACE("%p, %lu, %p, %#lx.\n", iface, id, type, flags); if (id != 0) return MF_E_INVALIDSTREAMNUMBER; @@ -345,10 +345,10 @@ static HRESULT WINAPI audio_converter_SetOutputType(IMFTransform *iface, DWORD i { struct audio_converter *converter = impl_audio_converter_from_IMFTransform(iface); GUID major_type, subtype; - DWORD unused; + UINT32 unused; HRESULT hr; - TRACE("%p, %u, %p, %#x.\n", iface, id, type, flags); + TRACE("%p, %lu, %p, %#lx.\n", iface, id, type, flags); if (id != 0) return MF_E_INVALIDSTREAMNUMBER; @@ -421,7 +421,7 @@ static HRESULT WINAPI audio_converter_GetInputCurrentType(IMFTransform *iface, D IMFMediaType *ret; HRESULT hr; - TRACE("%p, %u, %p.\n", converter, id, type); + TRACE("%p, %lu, %p.\n", converter, id, type); if (id != 0) return MF_E_INVALIDSTREAMNUMBER; @@ -452,7 +452,7 @@ static HRESULT WINAPI audio_converter_GetOutputCurrentType(IMFTransform *iface, IMFMediaType *ret; HRESULT hr; - TRACE("%p, %u, %p.\n", converter, id, type); + TRACE("%p, %lu, %p.\n", converter, id, type); if (id != 0) return MF_E_INVALIDSTREAMNUMBER; @@ -479,7 +479,7 @@ static HRESULT WINAPI audio_converter_GetOutputCurrentType(IMFTransform *iface, static HRESULT WINAPI audio_converter_GetInputStatus(IMFTransform *iface, DWORD id, DWORD *flags) { - FIXME("%p, %u, %p.\n", iface, id, flags); + FIXME("%p, %lu, %p.\n", iface, id, flags); return E_NOTIMPL; } @@ -500,14 +500,14 @@ static HRESULT WINAPI audio_converter_SetOutputBounds(IMFTransform *iface, LONGL static HRESULT WINAPI audio_converter_ProcessEvent(IMFTransform *iface, DWORD id, IMFMediaEvent *event) { - TRACE("%p, %u, %p.\n", iface, id, event); + TRACE("%p, %lu, %p.\n", iface, id, event); return E_NOTIMPL; } static HRESULT WINAPI audio_converter_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_TYPE message, ULONG_PTR param) { - TRACE("%p, %u %lu.\n", iface, message, param); + TRACE("%p, %u, %Iu.\n", iface, message, param); switch(message) { @@ -521,7 +521,7 @@ static HRESULT WINAPI audio_converter_ProcessMessage(IMFTransform *iface, MFT_ME static HRESULT WINAPI audio_converter_ProcessInput(IMFTransform *iface, DWORD id, IMFSample *sample, DWORD flags) { - FIXME("%p, %u, %p, %#x.\n", iface, id, sample, flags); + FIXME("%p, %lu, %p, %#lx.\n", iface, id, sample, flags); return E_NOTIMPL; } @@ -529,7 +529,7 @@ static HRESULT WINAPI audio_converter_ProcessInput(IMFTransform *iface, DWORD id static HRESULT WINAPI audio_converter_ProcessOutput(IMFTransform *iface, DWORD flags, DWORD count, MFT_OUTPUT_DATA_BUFFER *samples, DWORD *status) { - FIXME("%p, %#x, %u, %p, %p.\n", iface, flags, count, samples, status); + FIXME("%p, %#lx, %lu, %p, %p.\n", iface, flags, count, samples, status); return E_NOTIMPL; } diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 6ecd345cb73..85ec31d2498 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -304,7 +304,7 @@ static void flush_token_queue(struct media_stream *stream, BOOL send) &stream->parent_source->async_commands_callback, &command->IUnknown_iface); } if (FAILED(hr)) - WARN("Could not enqueue sample request, hr %#x\n", hr); + WARN("Could not enqueue sample request, hr %#lx\n", hr); } else if (stream->token_queue[i]) IUnknown_Release(stream->token_queue[i]); @@ -461,32 +461,32 @@ static void send_buffer(struct media_stream *stream, const struct wg_parser_even if (FAILED(hr = MFCreateSample(&sample))) { - ERR("Failed to create sample, hr %#x.\n", hr); + ERR("Failed to create sample, hr %#lx.\n", hr); return; } if (FAILED(hr = MFCreateMemoryBuffer(event->u.buffer.size, &buffer))) { - ERR("Failed to create buffer, hr %#x.\n", hr); + ERR("Failed to create buffer, hr %#lx.\n", hr); IMFSample_Release(sample); return; } if (FAILED(hr = IMFSample_AddBuffer(sample, buffer))) { - ERR("Failed to add buffer, hr %#x.\n", hr); + ERR("Failed to add buffer, hr %#lx.\n", hr); goto out; } if (FAILED(hr = IMFMediaBuffer_SetCurrentLength(buffer, event->u.buffer.size))) { - ERR("Failed to set size, hr %#x.\n", hr); + ERR("Failed to set size, hr %#lx.\n", hr); goto out; } if (FAILED(hr = IMFMediaBuffer_Lock(buffer, &data, NULL, NULL))) { - ERR("Failed to lock buffer, hr %#x.\n", hr); + ERR("Failed to lock buffer, hr %#lx.\n", hr); goto out; } @@ -500,19 +500,19 @@ static void send_buffer(struct media_stream *stream, const struct wg_parser_even if (FAILED(hr = IMFMediaBuffer_Unlock(buffer))) { - ERR("Failed to unlock buffer, hr %#x.\n", hr); + ERR("Failed to unlock buffer, hr %#lx.\n", hr); goto out; } if (FAILED(hr = IMFSample_SetSampleTime(sample, event->u.buffer.pts))) { - ERR("Failed to set sample time, hr %#x.\n", hr); + ERR("Failed to set sample time, hr %#lx.\n", hr); goto out; } if (FAILED(hr = IMFSample_SetSampleDuration(sample, event->u.buffer.duration))) { - ERR("Failed to set sample duration, hr %#x.\n", hr); + ERR("Failed to set sample duration, hr %#lx.\n", hr); goto out; } @@ -658,9 +658,9 @@ static DWORD CALLBACK read_thread(void *arg) if (SUCCEEDED(hr = IMFByteStream_SetCurrentPosition(byte_stream, offset))) hr = IMFByteStream_Read(byte_stream, data, size, &ret_size); if (FAILED(hr)) - ERR("Failed to read %u bytes at offset %I64u, hr %#x.\n", size, offset, hr); + ERR("Failed to read %u bytes at offset %I64u, hr %#lx.\n", size, offset, hr); else if (ret_size != size) - ERR("Unexpected short read: requested %u bytes, got %u.\n", size, ret_size); + ERR("Unexpected short read: requested %u bytes, got %lu.\n", size, ret_size); wg_parser_push_data(source->wg_parser, SUCCEEDED(hr) ? data : NULL, ret_size); } @@ -697,7 +697,7 @@ static ULONG WINAPI media_stream_AddRef(IMFMediaStream *iface) struct media_stream *stream = impl_from_IMFMediaStream(iface); ULONG ref = InterlockedIncrement(&stream->ref); - TRACE("%p, refcount %u.\n", iface, ref); + TRACE("%p, refcount %lu.\n", iface, ref); return ref; } @@ -707,7 +707,7 @@ static ULONG WINAPI media_stream_Release(IMFMediaStream *iface) struct media_stream *stream = impl_from_IMFMediaStream(iface); ULONG ref = InterlockedDecrement(&stream->ref); - TRACE("%p, refcount %u.\n", iface, ref); + TRACE("%p, refcount %lu.\n", iface, ref); if (!ref) { @@ -724,7 +724,7 @@ static HRESULT WINAPI media_stream_GetEvent(IMFMediaStream *iface, DWORD flags, { struct media_stream *stream = impl_from_IMFMediaStream(iface); - TRACE("%p, %#x, %p.\n", iface, flags, event); + TRACE("%p, %#lx, %p.\n", iface, flags, event); return IMFMediaEventQueue_GetEvent(stream->event_queue, flags, event); } @@ -752,7 +752,7 @@ static HRESULT WINAPI media_stream_QueueEvent(IMFMediaStream *iface, MediaEventT { struct media_stream *stream = impl_from_IMFMediaStream(iface); - TRACE("%p, %d, %s, %#x, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value); + TRACE("%p, %lu, %s, %#lx, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value); return IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, event_type, ext_type, hr, value); } @@ -843,7 +843,7 @@ static HRESULT new_media_stream(struct media_source *source, struct media_stream *object = calloc(1, sizeof(*object)); HRESULT hr; - TRACE("source %p, wg_stream %p, stream_id %u.\n", source, wg_stream, stream_id); + TRACE("source %p, wg_stream %p, stream_id %lu.\n", source, wg_stream, stream_id); object->IMFMediaStream_iface.lpVtbl = &media_stream_vtbl; object->ref = 1; @@ -1176,7 +1176,7 @@ static ULONG WINAPI media_source_AddRef(IMFMediaSource *iface) struct media_source *source = impl_from_IMFMediaSource(iface); ULONG ref = InterlockedIncrement(&source->ref); - TRACE("%p, refcount %u.\n", iface, ref); + TRACE("%p, refcount %lu.\n", iface, ref); return ref; } @@ -1186,7 +1186,7 @@ static ULONG WINAPI media_source_Release(IMFMediaSource *iface) struct media_source *source = impl_from_IMFMediaSource(iface); ULONG ref = InterlockedDecrement(&source->ref); - TRACE("%p, refcount %u.\n", iface, ref); + TRACE("%p, refcount %lu.\n", iface, ref); if (!ref) { @@ -1202,7 +1202,7 @@ static HRESULT WINAPI media_source_GetEvent(IMFMediaSource *iface, DWORD flags, { struct media_source *source = impl_from_IMFMediaSource(iface); - TRACE("%p, %#x, %p.\n", iface, flags, event); + TRACE("%p, %#lx, %p.\n", iface, flags, event); return IMFMediaEventQueue_GetEvent(source->event_queue, flags, event); } @@ -1230,7 +1230,7 @@ static HRESULT WINAPI media_source_QueueEvent(IMFMediaSource *iface, MediaEventT { struct media_source *source = impl_from_IMFMediaSource(iface); - TRACE("%p, %d, %s, %#x, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value); + TRACE("%p, %lu, %s, %#lx, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value); return IMFMediaEventQueue_QueueEventParamVar(source->event_queue, event_type, ext_type, hr, value); } @@ -1410,7 +1410,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ if (FAILED(hr = IMFByteStream_GetLength(bytestream, &file_size))) { - FIXME("Failed to get byte stream length, hr %#x.\n", hr); + FIXME("Failed to get byte stream length, hr %#lx.\n", hr); return hr; } @@ -1467,7 +1467,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ if (FAILED(hr = media_stream_init_desc(object->streams[i]))) { - ERR("Failed to finish initialization of media stream %p, hr %x.\n", object->streams[i], hr); + ERR("Failed to finish initialization of media stream %p, hr %#lx.\n", object->streams[i], hr); IMFMediaSource_Release(&object->streams[i]->parent_source->IMFMediaSource_iface); IMFMediaEventQueue_Release(object->streams[i]->event_queue); free(object->streams[i]); @@ -1509,7 +1509,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ return S_OK; fail: - WARN("Failed to construct MFMediaSource, hr %#x.\n", hr); + WARN("Failed to construct MFMediaSource, hr %#lx.\n", hr); if (descriptors) { @@ -1596,7 +1596,7 @@ static ULONG WINAPI winegstreamer_stream_handler_AddRef(IMFByteStreamHandler *if struct winegstreamer_stream_handler *handler = impl_from_IMFByteStreamHandler(iface); ULONG refcount = InterlockedIncrement(&handler->refcount); - TRACE("%p, refcount %u.\n", handler, refcount); + TRACE("%p, refcount %lu.\n", handler, refcount); return refcount; } @@ -1607,7 +1607,7 @@ static ULONG WINAPI winegstreamer_stream_handler_Release(IMFByteStreamHandler *i ULONG refcount = InterlockedDecrement(&handler->refcount); struct winegstreamer_stream_handler_result *result, *next; - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -1663,7 +1663,7 @@ static ULONG WINAPI create_object_context_AddRef(IUnknown *iface) struct create_object_context *context = impl_from_IUnknown(iface); ULONG refcount = InterlockedIncrement(&context->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -1673,7 +1673,7 @@ static ULONG WINAPI create_object_context_Release(IUnknown *iface) struct create_object_context *context = impl_from_IUnknown(iface); ULONG refcount = InterlockedDecrement(&context->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -1703,7 +1703,7 @@ static HRESULT WINAPI winegstreamer_stream_handler_BeginCreateObject(IMFByteStre IMFAsyncResult *caller, *item; HRESULT hr; - TRACE("%p, %s, %#x, %p, %p, %p, %p.\n", iface, debugstr_w(url), flags, props, cancel_cookie, callback, state); + TRACE("%p, %s, %#lx, %p, %p, %p, %p.\n", iface, debugstr_w(url), flags, props, cancel_cookie, callback, state); if (cancel_cookie) *cancel_cookie = NULL; @@ -1880,7 +1880,7 @@ static HRESULT WINAPI winegstreamer_stream_handler_callback_GetParameters(IMFAsy static HRESULT winegstreamer_stream_handler_create_object(struct winegstreamer_stream_handler *This, WCHAR *url, IMFByteStream *stream, DWORD flags, IPropertyStore *props, IUnknown **out_object, MF_OBJECT_TYPE *out_obj_type) { - TRACE("%p, %s, %p, %u, %p, %p, %p.\n", This, debugstr_w(url), stream, flags, props, out_object, out_obj_type); + TRACE("%p, %s, %p, %#lx, %p, %p, %p.\n", This, debugstr_w(url), stream, flags, props, out_object, out_obj_type); if (flags & MF_RESOLUTION_MEDIASOURCE) { @@ -1899,7 +1899,7 @@ static HRESULT winegstreamer_stream_handler_create_object(struct winegstreamer_s } else { - FIXME("flags = %08x\n", flags); + FIXME("Unhandled flags %#lx.\n", flags); return E_NOTIMPL; } } diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 6a58f444204..aa5e60ec116 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -64,7 +64,7 @@ static ULONG WINAPI video_processor_AddRef(IMFTransform *iface) struct video_processor *transform = impl_video_processor_from_IMFTransform(iface); ULONG refcount = InterlockedIncrement(&transform->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -74,7 +74,7 @@ static ULONG WINAPI video_processor_Release(IMFTransform *iface) struct video_processor *transform = impl_video_processor_from_IMFTransform(iface); ULONG refcount = InterlockedDecrement(&transform->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -146,7 +146,7 @@ static HRESULT WINAPI video_processor_GetOutputStreamAttributes(IMFTransform *if { struct video_processor *transform = impl_video_processor_from_IMFTransform(iface); - TRACE("%p, %u, %p.\n", iface, id, attributes); + TRACE("%p, %lu, %p.\n", iface, id, attributes); *attributes = transform->output_attributes; IMFAttributes_AddRef(*attributes); @@ -156,14 +156,14 @@ static HRESULT WINAPI video_processor_GetOutputStreamAttributes(IMFTransform *if static HRESULT WINAPI video_processor_DeleteInputStream(IMFTransform *iface, DWORD id) { - TRACE("%p, %u.\n", iface, id); + TRACE("%p, %lu.\n", iface, id); return E_NOTIMPL; } static HRESULT WINAPI video_processor_AddInputStreams(IMFTransform *iface, DWORD streams, DWORD *ids) { - TRACE("%p, %u, %p.\n", iface, streams, ids); + TRACE("%p, %lu, %p.\n", iface, streams, ids); return E_NOTIMPL; } @@ -171,7 +171,7 @@ static HRESULT WINAPI video_processor_AddInputStreams(IMFTransform *iface, DWORD static HRESULT WINAPI video_processor_GetInputAvailableType(IMFTransform *iface, DWORD id, DWORD index, IMFMediaType **type) { - FIXME("%p, %u, %u, %p.\n", iface, id, index, type); + FIXME("%p, %lu, %lu, %p.\n", iface, id, index, type); return E_NOTIMPL; } @@ -179,42 +179,42 @@ static HRESULT WINAPI video_processor_GetInputAvailableType(IMFTransform *iface, static HRESULT WINAPI video_processor_GetOutputAvailableType(IMFTransform *iface, DWORD id, DWORD index, IMFMediaType **type) { - FIXME("%p, %u, %u, %p.\n", iface, id, index, type); + FIXME("%p, %lu, %lu, %p.\n", iface, id, index, type); return E_NOTIMPL; } static HRESULT WINAPI video_processor_SetInputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) { - FIXME("%p, %u, %p, %#x.\n", iface, id, type, flags); + FIXME("%p, %lu, %p, %#lx.\n", iface, id, type, flags); return E_NOTIMPL; } static HRESULT WINAPI video_processor_SetOutputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) { - FIXME("%p, %u, %p, %#x.\n", iface, id, type, flags); + FIXME("%p, %lu, %p, %#lx.\n", iface, id, type, flags); return E_NOTIMPL; } static HRESULT WINAPI video_processor_GetInputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type) { - FIXME("%p, %u, %p.\n", iface, id, type); + FIXME("%p, %lu, %p.\n", iface, id, type); return E_NOTIMPL; } static HRESULT WINAPI video_processor_GetOutputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type) { - FIXME("%p, %u, %p.\n", iface, id, type); + FIXME("%p, %lu, %p.\n", iface, id, type); return E_NOTIMPL; } static HRESULT WINAPI video_processor_GetInputStatus(IMFTransform *iface, DWORD id, DWORD *flags) { - FIXME("%p, %u, %p.\n", iface, id, flags); + FIXME("%p, %lu, %p.\n", iface, id, flags); return E_NOTIMPL; } @@ -235,21 +235,21 @@ static HRESULT WINAPI video_processor_SetOutputBounds(IMFTransform *iface, LONGL static HRESULT WINAPI video_processor_ProcessEvent(IMFTransform *iface, DWORD id, IMFMediaEvent *event) { - TRACE("%p, %u, %p.\n", iface, id, event); + TRACE("%p, %lu, %p.\n", iface, id, event); return E_NOTIMPL; } static HRESULT WINAPI video_processor_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_TYPE message, ULONG_PTR param) { - FIXME("%p, %u.\n", iface, message); + FIXME("%p, %u, %#Ix.\n", iface, message, param); return E_NOTIMPL; } static HRESULT WINAPI video_processor_ProcessInput(IMFTransform *iface, DWORD id, IMFSample *sample, DWORD flags) { - FIXME("%p, %u, %p, %#x.\n", iface, id, sample, flags); + FIXME("%p, %lu, %p, %#lx.\n", iface, id, sample, flags); return E_NOTIMPL; } @@ -257,7 +257,7 @@ static HRESULT WINAPI video_processor_ProcessInput(IMFTransform *iface, DWORD id static HRESULT WINAPI video_processor_ProcessOutput(IMFTransform *iface, DWORD flags, DWORD count, MFT_OUTPUT_DATA_BUFFER *samples, DWORD *status) { - FIXME("%p, %#x, %u, %p, %p.\n", iface, flags, count, samples, status); + FIXME("%p, %#lx, %lu, %p, %p.\n", iface, flags, count, samples, status); return E_NOTIMPL; } @@ -521,7 +521,7 @@ HRESULT mfplat_DllRegisterServer(void) if (FAILED(hr)) { - FIXME("Failed to register MFT, hr %#x\n", hr); + FIXME("Failed to register MFT, hr %#lx.\n", hr); return hr; } } diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index e8d56d54785..331bc9a888a 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -452,7 +452,7 @@ static bool amt_to_wg_format_audio(const AM_MEDIA_TYPE *mt, struct wg_format *fo } if (mt->cbFormat < sizeof(WAVEFORMATEX) || !mt->pbFormat) { - ERR("Unexpected format size %u.\n", mt->cbFormat); + ERR("Unexpected format size %lu.\n", mt->cbFormat); return false; } @@ -504,7 +504,7 @@ static bool amt_to_wg_format_audio_mpeg1(const AM_MEDIA_TYPE *mt, struct wg_form } if (mt->cbFormat < sizeof(*audio_format) || !mt->pbFormat) { - ERR("Unexpected format size %u.\n", mt->cbFormat); + ERR("Unexpected format size %lu.\n", mt->cbFormat); return false; } @@ -533,7 +533,7 @@ static bool amt_to_wg_format_audio_mpeg1_layer3(const AM_MEDIA_TYPE *mt, struct } if (mt->cbFormat < sizeof(*audio_format) || !mt->pbFormat) { - ERR("Unexpected format size %u.\n", mt->cbFormat); + ERR("Unexpected format size %lu.\n", mt->cbFormat); return false; } @@ -578,7 +578,7 @@ static bool amt_to_wg_format_video(const AM_MEDIA_TYPE *mt, struct wg_format *fo } if (mt->cbFormat < sizeof(VIDEOINFOHEADER) || !mt->pbFormat) { - ERR("Unexpected format size %u.\n", mt->cbFormat); + ERR("Unexpected format size %lu.\n", mt->cbFormat); return false; } @@ -674,11 +674,11 @@ static HRESULT send_sample(struct parser_source *pin, IMediaSample *sample, HRESULT hr; BYTE *ptr = NULL; - TRACE("offset %u, size %u, sample size %u\n", offset, size, IMediaSample_GetSize(sample)); + TRACE("offset %u, size %u, sample size %lu.\n", offset, size, IMediaSample_GetSize(sample)); hr = IMediaSample_SetActualDataLength(sample, size); if(FAILED(hr)){ - WARN("SetActualDataLength failed: %08x\n", hr); + ERR("Failed to set sample size, hr %#lx.\n", hr); return hr; } @@ -728,12 +728,10 @@ static HRESULT send_sample(struct parser_source *pin, IMediaSample *sample, IMediaSample_SetSyncPoint(sample, !event->u.buffer.delta); if (!pin->pin.pin.peer) - hr = VFW_E_NOT_CONNECTED; - else - hr = IMemInputPin_Receive(pin->pin.pMemInputPin, sample); - - TRACE("sending sample returned: %08x\n", hr); + return VFW_E_NOT_CONNECTED; + hr = IMemInputPin_Receive(pin->pin.pMemInputPin, sample); + TRACE("Receive() returned hr %#lx.\n", hr); return hr; } @@ -760,7 +758,7 @@ static void send_buffer(struct parser_source *pin, const struct wg_parser_event if (FAILED(hr)) { if (hr != VFW_E_NOT_CONNECTED) - ERR("Could not get a delivery buffer (%x), returning GST_FLOW_FLUSHING\n", hr); + ERR("Failed to get a sample, hr %#lx.\n", hr); break; } @@ -783,7 +781,7 @@ static void send_buffer(struct parser_source *pin, const struct wg_parser_event if (FAILED(hr)) { if (hr != VFW_E_NOT_CONNECTED) - ERR("Could not get a delivery buffer (%x), returning GST_FLOW_FLUSHING\n", hr); + ERR("Failed to get a sample, hr %#lx.\n", hr); } else { @@ -879,7 +877,7 @@ static DWORD CALLBACK read_thread(void *arg) hr = IAsyncReader_SyncRead(filter->reader, offset, size, data); if (FAILED(hr)) - ERR("Failed to read %u bytes at offset %I64u, hr %#x.\n", size, offset, hr); + ERR("Failed to read %u bytes at offset %I64u, hr %#lx.\n", size, offset, hr); wg_parser_push_data(filter->wg_parser, SUCCEEDED(hr) ? data : NULL, size); } @@ -970,7 +968,7 @@ static HRESULT parser_init_stream(struct strmbase_filter *iface) continue; if (FAILED(hr = IMemAllocator_Commit(filter->sources[i]->pin.pAllocator))) - ERR("Failed to commit allocator, hr %#x.\n", hr); + ERR("Failed to commit allocator, hr %#lx.\n", hr); filter->sources[i]->thread = CreateThread(NULL, 0, stream_thread, filter->sources[i], 0, NULL); } @@ -1230,14 +1228,14 @@ static HRESULT WINAPI stream_select_Info(IAMStreamSelect *iface, LONG index, AM_MEDIA_TYPE **mt, DWORD *flags, LCID *lcid, DWORD *group, WCHAR **name, IUnknown **object, IUnknown **unknown) { - FIXME("iface %p, index %d, mt %p, flags %p, lcid %p, group %p, name %p, object %p, unknown %p, stub!\n", + FIXME("iface %p, index %ld, mt %p, flags %p, lcid %p, group %p, name %p, object %p, unknown %p, stub!\n", iface, index, mt, flags, lcid, group, name, object, unknown); return E_NOTIMPL; } static HRESULT WINAPI stream_select_Enable(IAMStreamSelect *iface, LONG index, DWORD flags) { - FIXME("iface %p, index %d, flags %#x, stub!\n", iface, index, flags); + FIXME("iface %p, index %ld, flags %#lx, stub!\n", iface, index, flags); return E_NOTIMPL; } @@ -1299,7 +1297,7 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, struct parser *filter = impl_from_strmbase_filter(pin->pin.pin.filter); int i; - TRACE("pin %p, current %s, current_flags %#x, stop %s, stop_flags %#x.\n", + TRACE("pin %p, current %s, current_flags %#lx, stop %s, stop_flags %#lx.\n", pin, current ? debugstr_time(*current) : "<null>", current_flags, stop ? debugstr_time(*stop) : "<null>", stop_flags); @@ -1419,7 +1417,7 @@ static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFil uint64_t timestamp; int64_t diff; - TRACE("pin %p, sender %p, type %s, proportion %u, late %s, timestamp %s.\n", + TRACE("pin %p, sender %p, type %s, proportion %ld, late %s, timestamp %s.\n", pin, sender, q.Type == Famine ? "Famine" : "Flood", q.Proportion, debugstr_time(q.Late), debugstr_time(q.TimeStamp)); diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index aa15a5a77f9..fc919ef2c49 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -66,7 +66,7 @@ static void open_stream(struct async_reader *reader, IWMReaderCallback *callback if (FAILED(hr = IWMReaderCallback_QueryInterface(callback, &IID_IWMReaderCallbackAdvanced, (void **)&reader->reader.callback_advanced))) reader->reader.callback_advanced = NULL; - TRACE("Querying for IWMReaderCallbackAdvanced returned %#x.\n", hr); + TRACE("Querying for IWMReaderCallbackAdvanced returned %#lx.\n", hr); } static DWORD WINAPI stream_thread(void *arg) @@ -139,13 +139,13 @@ static DWORD WINAPI stream_thread(void *arg) else hr = IWMReaderCallback_OnSample(callback, i, pts, duration, flags, sample, reader->context); - TRACE("Callback returned %#x.\n", hr); + TRACE("Callback returned %#lx.\n", hr); INSSBuffer_Release(sample); all_eos = false; } else if (hr != NS_E_NO_MORE_SAMPLES) { - ERR("Failed to get sample, hr %#x.\n", hr); + ERR("Failed to get sample, hr %#lx.\n", hr); return 0; } } @@ -279,7 +279,7 @@ static HRESULT WINAPI WMReader_GetOutputProps(IWMReader *iface, DWORD output, IW { struct async_reader *reader = impl_from_IWMReader(iface); - TRACE("reader %p, output %u, props %p.\n", reader, output, props); + TRACE("reader %p, output %lu, props %p.\n", reader, output, props); return wm_reader_get_output_props(&reader->reader, output, props); } @@ -288,7 +288,7 @@ static HRESULT WINAPI WMReader_SetOutputProps(IWMReader *iface, DWORD output, IW { struct async_reader *reader = impl_from_IWMReader(iface); - TRACE("reader %p, output %u, props %p.\n", reader, output, props); + TRACE("reader %p, output %lu, props %p.\n", reader, output, props); return wm_reader_set_output_props(&reader->reader, output, props); } @@ -297,7 +297,7 @@ static HRESULT WINAPI WMReader_GetOutputFormatCount(IWMReader *iface, DWORD outp { struct async_reader *reader = impl_from_IWMReader(iface); - TRACE("reader %p, output %u, count %p.\n", reader, output, count); + TRACE("reader %p, output %lu, count %p.\n", reader, output, count); return wm_reader_get_output_format_count(&reader->reader, output, count); } @@ -307,7 +307,7 @@ static HRESULT WINAPI WMReader_GetOutputFormat(IWMReader *iface, DWORD output, { struct async_reader *reader = impl_from_IWMReader(iface); - TRACE("reader %p, output %u, index %u, props %p.\n", reader, output, index, props); + TRACE("reader %p, output %lu, index %lu, props %p.\n", reader, output, index, props); return wm_reader_get_output_format(&reader->reader, output, index, props); } @@ -538,15 +538,17 @@ static HRESULT WINAPI WMReaderAdvanced_SetAllocateForOutput(IWMReaderAdvanced6 * { struct async_reader *reader = impl_from_IWMReaderAdvanced6(iface); - TRACE("reader %p, output %u, allocate %d.\n", reader, output, allocate); + TRACE("reader %p, output %lu, allocate %d.\n", reader, output, allocate); return wm_reader_set_allocate_for_output(&reader->reader, output, allocate); } static HRESULT WINAPI WMReaderAdvanced_GetAllocateForOutput(IWMReaderAdvanced6 *iface, DWORD output_num, BOOL *allocate) { - struct async_reader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%d %p)\n", This, output_num, allocate); + struct async_reader *reader = impl_from_IWMReaderAdvanced6(iface); + + FIXME("reader %p, output %lu, allocate %p, stub!\n", reader, output_num, allocate); + return E_NOTIMPL; } @@ -584,7 +586,7 @@ static HRESULT WINAPI WMReaderAdvanced_SetClientInfo(IWMReaderAdvanced6 *iface, static HRESULT WINAPI WMReaderAdvanced_GetMaxOutputSampleSize(IWMReaderAdvanced6 *iface, DWORD output, DWORD *max) { struct async_reader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%d %p)\n", This, output, max); + FIXME("(%p)->(%lu %p)\n", This, output, max); return E_NOTIMPL; } @@ -667,7 +669,7 @@ static HRESULT WINAPI WMReaderAdvanced2_GetOutputSetting(IWMReaderAdvanced6 *ifa const WCHAR *name, WMT_ATTR_DATATYPE *type, BYTE *value, WORD *length) { struct async_reader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%d %s %p %p %p)\n", This, output_num, debugstr_w(name), type, value, length); + FIXME("(%p)->(%lu %s %p %p %p)\n", This, output_num, debugstr_w(name), type, value, length); return E_NOTIMPL; } @@ -675,7 +677,7 @@ static HRESULT WINAPI WMReaderAdvanced2_SetOutputSetting(IWMReaderAdvanced6 *ifa const WCHAR *name, WMT_ATTR_DATATYPE type, const BYTE *value, WORD length) { struct async_reader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%d %s %d %p %d)\n", This, output_num, debugstr_w(name), type, value, length); + FIXME("(%p)->(%lu %s %#x %p %u)\n", This, output_num, debugstr_w(name), type, value, length); return E_NOTIMPL; } @@ -742,15 +744,18 @@ static HRESULT WINAPI WMReaderAdvanced3_StartAtPosition(IWMReaderAdvanced6 *ifac static HRESULT WINAPI WMReaderAdvanced4_GetLanguageCount(IWMReaderAdvanced6 *iface, DWORD output_num, WORD *language_count) { struct async_reader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%d %p)\n", This, output_num, language_count); + FIXME("(%p)->(%lu %p)\n", This, output_num, language_count); return E_NOTIMPL; } static HRESULT WINAPI WMReaderAdvanced4_GetLanguage(IWMReaderAdvanced6 *iface, DWORD output_num, WORD language, WCHAR *language_string, WORD *language_string_len) { - struct async_reader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%d %x %p %p)\n", This, output_num, language, language_string, language_string_len); + struct async_reader *reader = impl_from_IWMReaderAdvanced6(iface); + + FIXME("reader %p, output %lu, language %#x, language_string %p, language_string_len %p, stub!\n", + reader, output_num, language, language_string, language_string_len); + return E_NOTIMPL; } @@ -806,17 +811,21 @@ static HRESULT WINAPI WMReaderAdvanced4_GetURL(IWMReaderAdvanced6 *iface, WCHAR static HRESULT WINAPI WMReaderAdvanced5_SetPlayerHook(IWMReaderAdvanced6 *iface, DWORD output_num, IWMPlayerHook *hook) { - struct async_reader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%d %p)\n", This, output_num, hook); + struct async_reader *reader = impl_from_IWMReaderAdvanced6(iface); + + FIXME("reader %p, output %lu, hook %p, stub!\n", reader, output_num, hook); + return E_NOTIMPL; } static HRESULT WINAPI WMReaderAdvanced6_SetProtectStreamSamples(IWMReaderAdvanced6 *iface, BYTE *cert, DWORD cert_size, DWORD cert_type, DWORD flags, BYTE *initialization_vector, DWORD *initialization_vector_size) { - struct async_reader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%p %d %d %x %p %p)\n", This, cert, cert_size, cert_type, flags, initialization_vector, - initialization_vector_size); + struct async_reader *reader = impl_from_IWMReaderAdvanced6(iface); + + FIXME("reader %p, cert %p, cert_size %lu, cert_type %#lx, flags %#lx, vector %p, vector_size %p, stub!\n", + reader, cert, cert_size, cert_type, flags, initialization_vector, initialization_vector_size); + return E_NOTIMPL; } @@ -899,18 +908,18 @@ static ULONG WINAPI reader_accl_Release(IWMReaderAccelerator *iface) static HRESULT WINAPI reader_accl_GetCodecInterface(IWMReaderAccelerator *iface, DWORD output, REFIID riid, void **codec) { - struct async_reader *This = impl_from_IWMReaderAccelerator(iface); + struct async_reader *reader = impl_from_IWMReaderAccelerator(iface); - FIXME("%p, %d, %s, %p\n", This, output, debugstr_guid(riid), codec); + FIXME("reader %p, output %lu, iid %s, codec %p, stub!\n", reader, output, debugstr_guid(riid), codec); return E_NOTIMPL; } static HRESULT WINAPI reader_accl_Notify(IWMReaderAccelerator *iface, DWORD output, WM_MEDIA_TYPE *subtype) { - struct async_reader *This = impl_from_IWMReaderAccelerator(iface); + struct async_reader *reader = impl_from_IWMReaderAccelerator(iface); - FIXME("%p, %d, %p\n", This, output, subtype); + FIXME("reader %p, output %lu, subtype %p, stub!\n", reader, output, subtype); return E_NOTIMPL; } @@ -968,11 +977,13 @@ static HRESULT WINAPI networkconfig_GetUDPPortRanges(IWMReaderNetworkConfig2 *if return E_NOTIMPL; } -static HRESULT WINAPI networkconfig_SetUDPPortRanges(IWMReaderNetworkConfig2 *iface, WM_PORT_NUMBER_RANGE *array, - DWORD ranges) +static HRESULT WINAPI networkconfig_SetUDPPortRanges(IWMReaderNetworkConfig2 *iface, + WM_PORT_NUMBER_RANGE *ranges, DWORD count) { - struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %p, %u\n", This, array, ranges); + struct async_reader *reader = impl_from_IWMReaderNetworkConfig2(iface); + + FIXME("reader %p, ranges %p, count %lu.\n", reader, ranges, count); + return E_NOTIMPL; } @@ -1019,8 +1030,10 @@ static HRESULT WINAPI networkconfig_GetProxyPort(IWMReaderNetworkConfig2 *iface, static HRESULT WINAPI networkconfig_SetProxyPort(IWMReaderNetworkConfig2 *iface, const WCHAR *protocol, DWORD port) { - struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %s, %u\n", This, debugstr_w(protocol), port); + struct async_reader *reader = impl_from_IWMReaderNetworkConfig2(iface); + + FIXME("reader %p, protocol %s, port %lu, stub!\n", reader, debugstr_w(protocol), port); + return E_NOTIMPL; } @@ -1144,8 +1157,10 @@ static HRESULT WINAPI networkconfig_GetConnectionBandwidth(IWMReaderNetworkConfi static HRESULT WINAPI networkconfig_SetConnectionBandwidth(IWMReaderNetworkConfig2 *iface, DWORD bandwidth) { - struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %u\n", This, bandwidth); + struct async_reader *reader = impl_from_IWMReaderNetworkConfig2(iface); + + FIXME("reader %p, bandwidth %lu, stub!\n", reader, bandwidth); + return E_NOTIMPL; } @@ -1159,8 +1174,10 @@ static HRESULT WINAPI networkconfig_GetNumProtocolsSupported(IWMReaderNetworkCon static HRESULT WINAPI networkconfig_GetSupportedProtocolName(IWMReaderNetworkConfig2 *iface, DWORD protocol_num, WCHAR *protocol, DWORD *size) { - struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %u, %p %p\n", This, protocol_num, protocol, size); + struct async_reader *reader = impl_from_IWMReaderNetworkConfig2(iface); + + FIXME("reader %p, index %lu, protocol %p, size %p, stub!\n", reader, protocol_num, protocol, size); + return E_NOTIMPL; } @@ -1174,8 +1191,10 @@ static HRESULT WINAPI networkconfig_AddLoggingUrl(IWMReaderNetworkConfig2 *iface static HRESULT WINAPI networkconfig_GetLoggingUrl(IWMReaderNetworkConfig2 *iface, DWORD index, WCHAR *url, DWORD *size) { - struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %u, %p, %p\n", This, index, url, size); + struct async_reader *reader = impl_from_IWMReaderNetworkConfig2(iface); + + FIXME("reader %p, index %lu, url %p, size %p, stub!\n", reader, index, url, size); + return E_NOTIMPL; } @@ -1246,8 +1265,10 @@ static HRESULT WINAPI networkconfig_GetAutoReconnectLimit(IWMReaderNetworkConfig static HRESULT WINAPI networkconfig_SetAutoReconnectLimit(IWMReaderNetworkConfig2 *iface, DWORD limit) { - struct async_reader *This = impl_from_IWMReaderNetworkConfig2(iface); - FIXME("%p, %u\n", This, limit); + struct async_reader *reader = impl_from_IWMReaderNetworkConfig2(iface); + + FIXME("reader %p, limit %lu, stub!\n", reader, limit); + return E_NOTIMPL; } @@ -1378,8 +1399,10 @@ static HRESULT WINAPI readclock_SetTimer(IWMReaderStreamClock *iface, QWORD when static HRESULT WINAPI readclock_KillTimer(IWMReaderStreamClock *iface, DWORD id) { - struct async_reader *This = impl_from_IWMReaderStreamClock(iface); - FIXME("%p, %d\n", This, id); + struct async_reader *reader = impl_from_IWMReaderStreamClock(iface); + + FIXME("reader %p, id %lu, stub!\n", reader, id); + return E_NOTIMPL; } @@ -1418,8 +1441,10 @@ static ULONG WINAPI negotiation_Release(IWMReaderTypeNegotiation *iface) static HRESULT WINAPI negotiation_TryOutputProps(IWMReaderTypeNegotiation *iface, DWORD output, IWMOutputMediaProps *props) { - struct async_reader *This = impl_from_IWMReaderTypeNegotiation(iface); - FIXME("%p, %d, %p\n", This, output, props); + struct async_reader *reader = impl_from_IWMReaderTypeNegotiation(iface); + + FIXME("reader %p, output %lu, props %p, stub!\n", reader, output, props); + return E_NOTIMPL; } @@ -1464,25 +1489,31 @@ static HRESULT WINAPI refclock_GetTime(IReferenceClock *iface, REFERENCE_TIME *t static HRESULT WINAPI refclock_AdviseTime(IReferenceClock *iface, REFERENCE_TIME basetime, REFERENCE_TIME streamtime, HEVENT event, DWORD_PTR *cookie) { - struct async_reader *This = impl_from_IReferenceClock(iface); - FIXME("%p, %s, %s, %lu, %p\n", This, wine_dbgstr_longlong(basetime), - wine_dbgstr_longlong(streamtime), event, cookie); + struct async_reader *reader = impl_from_IReferenceClock(iface); + + FIXME("reader %p, basetime %s, streamtime %s, event %#Ix, cookie %p, stub!\n", + reader, debugstr_time(basetime), debugstr_time(streamtime), event, cookie); + return E_NOTIMPL; } static HRESULT WINAPI refclock_AdvisePeriodic(IReferenceClock *iface, REFERENCE_TIME starttime, REFERENCE_TIME period, HSEMAPHORE semaphore, DWORD_PTR *cookie) { - struct async_reader *This = impl_from_IReferenceClock(iface); - FIXME("%p, %s, %s, %lu, %p\n", This, wine_dbgstr_longlong(starttime), - wine_dbgstr_longlong(period), semaphore, cookie); + struct async_reader *reader = impl_from_IReferenceClock(iface); + + FIXME("reader %p, starttime %s, period %s, semaphore %#Ix, cookie %p, stub!\n", + reader, debugstr_time(starttime), debugstr_time(period), semaphore, cookie); + return E_NOTIMPL; } static HRESULT WINAPI refclock_Unadvise(IReferenceClock *iface, DWORD_PTR cookie) { - struct async_reader *This = impl_from_IReferenceClock(iface); - FIXME("%p, %lu\n", This, cookie); + struct async_reader *reader = impl_from_IReferenceClock(iface); + + FIXME("reader %p, cookie %Iu, stub!\n", reader, cookie); + return E_NOTIMPL; } diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 1a2b8d7614b..d6dddc177eb 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -24,7 +24,7 @@ static struct wm_stream *get_stream_by_output_number(struct wm_reader *reader, D { if (output < reader->stream_count) return &reader->streams[output]; - WARN("Invalid output number %u.\n", output); + WARN("Invalid output number %lu.\n", output); return NULL; } @@ -65,7 +65,7 @@ static ULONG WINAPI output_props_AddRef(IWMOutputMediaProps *iface) struct output_props *props = impl_from_IWMOutputMediaProps(iface); ULONG refcount = InterlockedIncrement(&props->refcount); - TRACE("%p increasing refcount to %u.\n", props, refcount); + TRACE("%p increasing refcount to %lu.\n", props, refcount); return refcount; } @@ -75,7 +75,7 @@ static ULONG WINAPI output_props_Release(IWMOutputMediaProps *iface) struct output_props *props = impl_from_IWMOutputMediaProps(iface); ULONG refcount = InterlockedDecrement(&props->refcount); - TRACE("%p decreasing refcount to %u.\n", props, refcount); + TRACE("%p decreasing refcount to %lu.\n", props, refcount); if (!refcount) free(props); @@ -209,7 +209,7 @@ static ULONG WINAPI buffer_AddRef(INSSBuffer *iface) struct buffer *buffer = impl_from_INSSBuffer(iface); ULONG refcount = InterlockedIncrement(&buffer->refcount); - TRACE("%p increasing refcount to %u.\n", buffer, refcount); + TRACE("%p increasing refcount to %lu.\n", buffer, refcount); return refcount; } @@ -219,7 +219,7 @@ static ULONG WINAPI buffer_Release(INSSBuffer *iface) struct buffer *buffer = impl_from_INSSBuffer(iface); ULONG refcount = InterlockedDecrement(&buffer->refcount); - TRACE("%p decreasing refcount to %u.\n", buffer, refcount); + TRACE("%p decreasing refcount to %lu.\n", buffer, refcount); if (!refcount) free(buffer); @@ -237,7 +237,7 @@ static HRESULT WINAPI buffer_SetLength(INSSBuffer *iface, DWORD size) { struct buffer *buffer = impl_from_INSSBuffer(iface); - TRACE("iface %p, size %u.\n", buffer, size); + TRACE("iface %p, size %lu.\n", buffer, size); if (size > buffer->capacity) return E_INVALIDARG; @@ -329,7 +329,7 @@ static ULONG WINAPI stream_config_AddRef(IWMStreamConfig *iface) struct stream_config *config = impl_from_IWMStreamConfig(iface); ULONG refcount = InterlockedIncrement(&config->refcount); - TRACE("%p increasing refcount to %u.\n", config, refcount); + TRACE("%p increasing refcount to %lu.\n", config, refcount); return refcount; } @@ -339,7 +339,7 @@ static ULONG WINAPI stream_config_Release(IWMStreamConfig *iface) struct stream_config *config = impl_from_IWMStreamConfig(iface); ULONG refcount = InterlockedDecrement(&config->refcount); - TRACE("%p decreasing refcount to %u.\n", config, refcount); + TRACE("%p decreasing refcount to %lu.\n", config, refcount); if (!refcount) { @@ -422,7 +422,7 @@ static HRESULT WINAPI stream_config_GetBitrate(IWMStreamConfig *iface, DWORD *bi static HRESULT WINAPI stream_config_SetBitrate(IWMStreamConfig *iface, DWORD bitrate) { - FIXME("iface %p, bitrate %u, stub!\n", iface, bitrate); + FIXME("iface %p, bitrate %lu, stub!\n", iface, bitrate); return E_NOTIMPL; } @@ -434,7 +434,7 @@ static HRESULT WINAPI stream_config_GetBufferWindow(IWMStreamConfig *iface, DWOR static HRESULT WINAPI stream_config_SetBufferWindow(IWMStreamConfig *iface, DWORD window) { - FIXME("iface %p, window %u, stub!\n", iface, window); + FIXME("iface %p, window %lu, stub!\n", iface, window); return E_NOTIMPL; } @@ -591,7 +591,7 @@ static DWORD CALLBACK read_thread(void *arg) if (!SetFilePointerEx(file, large_offset, NULL, FILE_BEGIN) || !ReadFile(file, data, size, &ret_size, NULL)) { - ERR("Failed to read %u bytes at offset %I64u, error %u.\n", size, offset, GetLastError()); + ERR("Failed to read %u bytes at offset %I64u, error %lu.\n", size, offset, GetLastError()); wg_parser_push_data(reader->wg_parser, NULL, 0); continue; } @@ -602,14 +602,14 @@ static DWORD CALLBACK read_thread(void *arg) hr = IStream_Read(stream, data, size, &ret_size); if (FAILED(hr)) { - ERR("Failed to read %u bytes at offset %I64u, hr %#x.\n", size, offset, hr); + ERR("Failed to read %u bytes at offset %I64u, hr %#lx.\n", size, offset, hr); wg_parser_push_data(reader->wg_parser, NULL, 0); continue; } } if (ret_size != size) - ERR("Unexpected short read: requested %u bytes, got %u.\n", size, ret_size); + ERR("Unexpected short read: requested %u bytes, got %lu.\n", size, ret_size); wg_parser_push_data(reader->wg_parser, data, ret_size); } @@ -674,7 +674,7 @@ static ULONG WINAPI profile_AddRef(IWMProfile3 *iface) struct wm_reader *reader = impl_from_IWMProfile3(iface); ULONG refcount = InterlockedIncrement(&reader->refcount); - TRACE("%p increasing refcount to %u.\n", reader, refcount); + TRACE("%p increasing refcount to %lu.\n", reader, refcount); return refcount; } @@ -684,7 +684,7 @@ static ULONG WINAPI profile_Release(IWMProfile3 *iface) struct wm_reader *reader = impl_from_IWMProfile3(iface); ULONG refcount = InterlockedDecrement(&reader->refcount); - TRACE("%p decreasing refcount to %u.\n", reader, refcount); + TRACE("%p decreasing refcount to %lu.\n", reader, refcount); if (!refcount) reader->ops->destroy(reader); @@ -742,14 +742,14 @@ static HRESULT WINAPI profile_GetStream(IWMProfile3 *iface, DWORD index, IWMStre struct wm_reader *reader = impl_from_IWMProfile3(iface); struct stream_config *object; - TRACE("reader %p, index %u, config %p.\n", reader, index, config); + TRACE("reader %p, index %lu, config %p.\n", reader, index, config); EnterCriticalSection(&reader->cs); if (index >= reader->stream_count) { LeaveCriticalSection(&reader->cs); - WARN("Index %u exceeds stream count %u; returning E_INVALIDARG.\n", index, reader->stream_count); + WARN("Index %lu exceeds stream count %u; returning E_INVALIDARG.\n", index, reader->stream_count); return E_INVALIDARG; } @@ -816,7 +816,7 @@ static HRESULT WINAPI profile_GetMutualExclusionCount(IWMProfile3 *iface, DWORD static HRESULT WINAPI profile_GetMutualExclusion(IWMProfile3 *iface, DWORD index, IWMMutualExclusion **excl) { - FIXME("iface %p, index %u, excl %p, stub!\n", iface, index, excl); + FIXME("iface %p, index %lu, excl %p, stub!\n", iface, index, excl); return E_NOTIMPL; } @@ -864,7 +864,7 @@ static HRESULT WINAPI profile_GetBandwidthSharingCount(IWMProfile3 *iface, DWORD static HRESULT WINAPI profile_GetBandwidthSharing(IWMProfile3 *iface, DWORD index, IWMBandwidthSharing **sharing) { - FIXME("iface %p, index %d, sharing %p, stub!\n", iface, index, sharing); + FIXME("iface %p, index %lu, sharing %p, stub!\n", iface, index, sharing); return E_NOTIMPL; } @@ -1131,7 +1131,7 @@ static HRESULT WINAPI header_info_GetCodecInfoCount(IWMHeaderInfo3 *iface, DWORD static HRESULT WINAPI header_info_GetCodecInfo(IWMHeaderInfo3 *iface, DWORD index, WORD *name_len, WCHAR *name, WORD *desc_len, WCHAR *desc, WMT_CODEC_INFO_TYPE *type, WORD *size, BYTE *info) { - FIXME("iface %p, index %u, name_len %p, name %p, desc_len %p, desc %p, type %p, size %p, info %p, stub!\n", + FIXME("iface %p, index %lu, name_len %p, name %p, desc_len %p, desc %p, type %p, size %p, info %p, stub!\n", iface, index, name_len, name, desc_len, desc, type, size, info); return E_NOTIMPL; } @@ -1163,7 +1163,7 @@ static HRESULT WINAPI header_info_GetAttributeByIndexEx(IWMHeaderInfo3 *iface, static HRESULT WINAPI header_info_ModifyAttribute(IWMHeaderInfo3 *iface, WORD stream_number, WORD index, WMT_ATTR_DATATYPE type, WORD lang_index, const BYTE *value, DWORD size) { - FIXME("iface %p, stream_number %u, index %u, type %#x, lang_index %u, value %p, size %u, stub!\n", + FIXME("iface %p, stream_number %u, index %u, type %#x, lang_index %u, value %p, size %lu, stub!\n", iface, stream_number, index, type, lang_index, value, size); return E_NOTIMPL; } @@ -1172,7 +1172,7 @@ static HRESULT WINAPI header_info_AddAttribute(IWMHeaderInfo3 *iface, WORD stream_number, const WCHAR *name, WORD *index, WMT_ATTR_DATATYPE type, WORD lang_index, const BYTE *value, DWORD size) { - FIXME("iface %p, stream_number %u, name %s, index %p, type %#x, lang_index %u, value %p, size %u, stub!\n", + FIXME("iface %p, stream_number %u, name %s, index %p, type %#x, lang_index %u, value %p, size %lu, stub!\n", iface, stream_number, debugstr_w(name), index, type, lang_index, value, size); return E_NOTIMPL; } @@ -1309,7 +1309,7 @@ static HRESULT WINAPI packet_size_GetMaxPacketSize(IWMPacketSize2 *iface, DWORD static HRESULT WINAPI packet_size_SetMaxPacketSize(IWMPacketSize2 *iface, DWORD size) { - FIXME("iface %p, size %u, stub!\n", iface, size); + FIXME("iface %p, size %lu, stub!\n", iface, size); return E_NOTIMPL; } @@ -1321,7 +1321,7 @@ static HRESULT WINAPI packet_size_GetMinPacketSize(IWMPacketSize2 *iface, DWORD static HRESULT WINAPI packet_size_SetMinPacketSize(IWMPacketSize2 *iface, DWORD size) { - FIXME("iface %p, size %u, stub!\n", iface, size); + FIXME("iface %p, size %lu, stub!\n", iface, size); return E_NOTIMPL; } @@ -1365,14 +1365,14 @@ static ULONG WINAPI playlist_Release(IWMReaderPlaylistBurn *iface) static HRESULT WINAPI playlist_InitPlaylistBurn(IWMReaderPlaylistBurn *iface, DWORD count, const WCHAR **filenames, IWMStatusCallback *callback, void *context) { - FIXME("iface %p, count %u, filenames %p, callback %p, context %p, stub!\n", + FIXME("iface %p, count %lu, filenames %p, callback %p, context %p, stub!\n", iface, count, filenames, callback, context); return E_NOTIMPL; } static HRESULT WINAPI playlist_GetInitResults(IWMReaderPlaylistBurn *iface, DWORD count, HRESULT *hrs) { - FIXME("iface %p, count %u, hrs %p, stub!\n", iface, count, hrs); + FIXME("iface %p, count %lu, hrs %p, stub!\n", iface, count, hrs); return E_NOTIMPL; } @@ -1384,7 +1384,7 @@ static HRESULT WINAPI playlist_Cancel(IWMReaderPlaylistBurn *iface) static HRESULT WINAPI playlist_EndPlaylistBurn(IWMReaderPlaylistBurn *iface, HRESULT hr) { - FIXME("iface %p, hr %#x, stub!\n", iface, hr); + FIXME("iface %p, hr %#lx, stub!\n", iface, hr); return E_NOTIMPL; } @@ -1468,7 +1468,7 @@ static HRESULT init_stream(struct wm_reader *reader, QWORD file_size) if (FAILED(hr = wg_parser_connect(reader->wg_parser, file_size))) { - ERR("Failed to connect parser, hr %#x.\n", hr); + ERR("Failed to connect parser, hr %#lx.\n", hr); goto out_shutdown_thread; } @@ -1543,7 +1543,7 @@ HRESULT wm_reader_open_stream(struct wm_reader *reader, IStream *stream) if (FAILED(hr = IStream_Stat(stream, &stat, STATFLAG_NONAME))) { - ERR("Failed to stat stream, hr %#x.\n", hr); + ERR("Failed to stat stream, hr %#lx.\n", hr); return hr; } @@ -1569,13 +1569,13 @@ HRESULT wm_reader_open_file(struct wm_reader *reader, const WCHAR *filename) if ((file = CreateFileW(filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL)) == INVALID_HANDLE_VALUE) { - ERR("Failed to open %s, error %u.\n", debugstr_w(filename), GetLastError()); + ERR("Failed to open %s, error %lu.\n", debugstr_w(filename), GetLastError()); return HRESULT_FROM_WIN32(GetLastError()); } if (!GetFileSizeEx(file, &size)) { - ERR("Failed to get the size of %s, error %u.\n", debugstr_w(filename), GetLastError()); + ERR("Failed to get the size of %s, error %lu.\n", debugstr_w(filename), GetLastError()); CloseHandle(file); return HRESULT_FROM_WIN32(GetLastError()); } @@ -1851,7 +1851,7 @@ HRESULT wm_reader_get_stream_sample(struct wm_stream *stream, if (FAILED(hr = IWMReaderCallbackAdvanced_AllocateForStream(callback_advanced, stream->index + 1, event.u.buffer.size, &sample, NULL))) { - ERR("Failed to allocate stream sample of %u bytes, hr %#x.\n", event.u.buffer.size, hr); + ERR("Failed to allocate stream sample of %u bytes, hr %#lx.\n", event.u.buffer.size, hr); wg_parser_stream_release_buffer(wg_stream); return hr; } @@ -1861,7 +1861,7 @@ HRESULT wm_reader_get_stream_sample(struct wm_stream *stream, if (FAILED(hr = IWMReaderCallbackAdvanced_AllocateForOutput(callback_advanced, stream->index, event.u.buffer.size, &sample, NULL))) { - ERR("Failed to allocate output sample of %u bytes, hr %#x.\n", event.u.buffer.size, hr); + ERR("Failed to allocate output sample of %u bytes, hr %#lx.\n", event.u.buffer.size, hr); wg_parser_stream_release_buffer(wg_stream); return hr; } @@ -1886,11 +1886,11 @@ HRESULT wm_reader_get_stream_sample(struct wm_stream *stream, } if (FAILED(hr = INSSBuffer_GetBufferAndLength(sample, &data, &size))) - ERR("Failed to get data pointer, hr %#x.\n", hr); + ERR("Failed to get data pointer, hr %#lx.\n", hr); if (FAILED(hr = INSSBuffer_GetMaxLength(sample, &capacity))) - ERR("Failed to get capacity, hr %#x.\n", hr); + ERR("Failed to get capacity, hr %#lx.\n", hr); if (event.u.buffer.size > capacity) - ERR("Returned capacity %u is less than requested capacity %u.\n", + ERR("Returned capacity %lu is less than requested capacity %u.\n", capacity, event.u.buffer.size); if (!wg_parser_stream_copy_buffer(wg_stream, data, 0, event.u.buffer.size)) @@ -1901,7 +1901,7 @@ HRESULT wm_reader_get_stream_sample(struct wm_stream *stream, } if (FAILED(hr = INSSBuffer_SetLength(sample, event.u.buffer.size))) - ERR("Failed to set size %u, hr %#x.\n", event.u.buffer.size, hr); + ERR("Failed to set size %u, hr %#lx.\n", event.u.buffer.size, hr); wg_parser_stream_release_buffer(wg_stream); diff --git a/dlls/winegstreamer/wm_syncreader.c b/dlls/winegstreamer/wm_syncreader.c index 96754d107de..e86645a207a 100644 --- a/dlls/winegstreamer/wm_syncreader.c +++ b/dlls/winegstreamer/wm_syncreader.c @@ -67,7 +67,7 @@ static HRESULT WINAPI WMSyncReader_Close(IWMSyncReader2 *iface) static HRESULT WINAPI WMSyncReader_GetMaxOutputSampleSize(IWMSyncReader2 *iface, DWORD output, DWORD *max) { struct sync_reader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%d %p): stub!\n", This, output, max); + FIXME("(%p)->(%lu %p): stub!\n", This, output, max); return E_NOTIMPL; } @@ -160,7 +160,7 @@ static HRESULT WINAPI WMSyncReader_GetOutputFormat(IWMSyncReader2 *iface, { struct sync_reader *reader = impl_from_IWMSyncReader2(iface); - TRACE("reader %p, output %u, index %u, props %p.\n", reader, output, index, props); + TRACE("reader %p, output %lu, index %lu, props %p.\n", reader, output, index, props); return wm_reader_get_output_format(&reader->reader, output, index, props); } @@ -169,7 +169,7 @@ static HRESULT WINAPI WMSyncReader_GetOutputFormatCount(IWMSyncReader2 *iface, D { struct sync_reader *reader = impl_from_IWMSyncReader2(iface); - TRACE("reader %p, output %u, count %p.\n", reader, output, count); + TRACE("reader %p, output %lu, count %p.\n", reader, output, count); return wm_reader_get_output_format_count(&reader->reader, output, count); } @@ -190,7 +190,7 @@ static HRESULT WINAPI WMSyncReader_GetOutputProps(IWMSyncReader2 *iface, { struct sync_reader *reader = impl_from_IWMSyncReader2(iface); - TRACE("reader %p, output %u, props %p.\n", reader, output, props); + TRACE("reader %p, output %lu, props %p.\n", reader, output, props); return wm_reader_get_output_props(&reader->reader, output, props); } @@ -199,7 +199,7 @@ static HRESULT WINAPI WMSyncReader_GetOutputSetting(IWMSyncReader2 *iface, DWORD WMT_ATTR_DATATYPE *type, BYTE *value, WORD *length) { struct sync_reader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%u %s %p %p %p): stub!\n", This, output_num, debugstr_w(name), type, value, length); + FIXME("(%p)->(%lu %s %p %p %p): stub!\n", This, output_num, debugstr_w(name), type, value, length); return E_NOTIMPL; } @@ -215,7 +215,7 @@ static HRESULT WINAPI WMSyncReader_GetStreamNumberForOutput(IWMSyncReader2 *ifac { struct sync_reader *reader = impl_from_IWMSyncReader2(iface); - TRACE("reader %p, output %u, stream_number %p.\n", reader, output, stream_number); + TRACE("reader %p, output %lu, stream_number %p.\n", reader, output, stream_number); *stream_number = output + 1; return S_OK; @@ -253,7 +253,7 @@ static HRESULT WINAPI WMSyncReader_SetOutputProps(IWMSyncReader2 *iface, DWORD o { struct sync_reader *reader = impl_from_IWMSyncReader2(iface); - TRACE("reader %p, output %u, props %p.\n", reader, output, props); + TRACE("reader %p, output %lu, props %p.\n", reader, output, props); return wm_reader_set_output_props(&reader->reader, output, props); } @@ -263,7 +263,7 @@ static HRESULT WINAPI WMSyncReader_SetOutputSetting(IWMSyncReader2 *iface, DWORD { struct sync_reader *reader = impl_from_IWMSyncReader2(iface); - TRACE("reader %p, output %u, name %s, type %#x, value %p, size %u.\n", + TRACE("reader %p, output %lu, name %s, type %#x, value %p, size %u.\n", reader, output, debugstr_w(name), type, value, size); if (!wcscmp(name, L"VideoSampleDurations")) @@ -336,28 +336,28 @@ static HRESULT WINAPI WMSyncReader2_SetRangeByFrameEx(IWMSyncReader2 *iface, WOR static HRESULT WINAPI WMSyncReader2_SetAllocateForOutput(IWMSyncReader2 *iface, DWORD output_num, IWMReaderAllocatorEx *allocator) { struct sync_reader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%d %p): stub!\n", This, output_num, allocator); + FIXME("(%p)->(%lu %p): stub!\n", This, output_num, allocator); return E_NOTIMPL; } static HRESULT WINAPI WMSyncReader2_GetAllocateForOutput(IWMSyncReader2 *iface, DWORD output_num, IWMReaderAllocatorEx **allocator) { struct sync_reader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%d %p): stub!\n", This, output_num, allocator); + FIXME("(%p)->(%lu %p): stub!\n", This, output_num, allocator); return E_NOTIMPL; } static HRESULT WINAPI WMSyncReader2_SetAllocateForStream(IWMSyncReader2 *iface, DWORD stream_num, IWMReaderAllocatorEx *allocator) { struct sync_reader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%d %p): stub!\n", This, stream_num, allocator); + FIXME("(%p)->(%lu %p): stub!\n", This, stream_num, allocator); return E_NOTIMPL; } static HRESULT WINAPI WMSyncReader2_GetAllocateForStream(IWMSyncReader2 *iface, DWORD stream_num, IWMReaderAllocatorEx **allocator) { struct sync_reader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%d %p): stub!\n", This, stream_num, allocator); + FIXME("(%p)->(%lu %p): stub!\n", This, stream_num, allocator); return E_NOTIMPL; } diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c index a6fdbf27724..945390f44db 100644 --- a/dlls/winegstreamer/wma_decoder.c +++ b/dlls/winegstreamer/wma_decoder.c @@ -90,7 +90,7 @@ static ULONG WINAPI unknown_AddRef(IUnknown *iface) struct wma_decoder *decoder = impl_from_IUnknown(iface); ULONG refcount = InterlockedIncrement(&decoder->refcount); - TRACE("iface %p increasing refcount to %u.\n", decoder, refcount); + TRACE("iface %p increasing refcount to %lu.\n", decoder, refcount); return refcount; } @@ -100,7 +100,7 @@ static ULONG WINAPI unknown_Release(IUnknown *iface) struct wma_decoder *decoder = impl_from_IUnknown(iface); ULONG refcount = InterlockedDecrement(&decoder->refcount); - TRACE("iface %p decreasing refcount to %u.\n", decoder, refcount); + TRACE("iface %p decreasing refcount to %lu.\n", decoder, refcount); if (!refcount) { @@ -161,7 +161,7 @@ static HRESULT WINAPI transform_GetStreamCount(IMFTransform *iface, DWORD *input static HRESULT WINAPI transform_GetStreamIDs(IMFTransform *iface, DWORD input_size, DWORD *inputs, DWORD output_size, DWORD *outputs) { - FIXME("iface %p, input_size %u, inputs %p, output_size %u, outputs %p stub!\n", iface, + FIXME("iface %p, input_size %lu, inputs %p, output_size %lu, outputs %p stub!\n", iface, input_size, inputs, output_size, outputs); return E_NOTIMPL; } @@ -172,7 +172,7 @@ static HRESULT WINAPI transform_GetInputStreamInfo(IMFTransform *iface, DWORD id UINT32 block_alignment; HRESULT hr; - TRACE("iface %p, id %u, info %p.\n", iface, id, info); + TRACE("iface %p, id %lu, info %p.\n", iface, id, info); if (!decoder->input_type || !decoder->output_type) return MF_E_TRANSFORM_TYPE_NOT_SET; @@ -195,7 +195,7 @@ static HRESULT WINAPI transform_GetOutputStreamInfo(IMFTransform *iface, DWORD i UINT32 channel_count, block_alignment; HRESULT hr; - TRACE("iface %p, id %u, info %p.\n", iface, id, info); + TRACE("iface %p, id %lu, info %p.\n", iface, id, info); if (!decoder->input_type || !decoder->output_type) return MF_E_TRANSFORM_TYPE_NOT_SET; @@ -220,32 +220,32 @@ static HRESULT WINAPI transform_GetAttributes(IMFTransform *iface, IMFAttributes static HRESULT WINAPI transform_GetInputStreamAttributes(IMFTransform *iface, DWORD id, IMFAttributes **attributes) { - FIXME("iface %p, id %u, attributes %p stub!\n", iface, id, attributes); + FIXME("iface %p, id %lu, attributes %p stub!\n", iface, id, attributes); return E_NOTIMPL; } static HRESULT WINAPI transform_GetOutputStreamAttributes(IMFTransform *iface, DWORD id, IMFAttributes **attributes) { - FIXME("iface %p, id %u, attributes %p stub!\n", iface, id, attributes); + FIXME("iface %p, id %lu, attributes %p stub!\n", iface, id, attributes); return E_NOTIMPL; } static HRESULT WINAPI transform_DeleteInputStream(IMFTransform *iface, DWORD id) { - FIXME("iface %p, id %u stub!\n", iface, id); + FIXME("iface %p, id %lu stub!\n", iface, id); return E_NOTIMPL; } static HRESULT WINAPI transform_AddInputStreams(IMFTransform *iface, DWORD streams, DWORD *ids) { - FIXME("iface %p, streams %u, ids %p stub!\n", iface, streams, ids); + FIXME("iface %p, streams %lu, ids %p stub!\n", iface, streams, ids); return E_NOTIMPL; } static HRESULT WINAPI transform_GetInputAvailableType(IMFTransform *iface, DWORD id, DWORD index, IMFMediaType **type) { - FIXME("iface %p, id %u, index %u, type %p stub!\n", iface, id, index, type); + FIXME("iface %p, id %lu, index %lu, type %p stub!\n", iface, id, index, type); return E_NOTIMPL; } @@ -258,7 +258,7 @@ static HRESULT WINAPI transform_GetOutputAvailableType(IMFTransform *iface, DWOR const GUID *output_type; HRESULT hr; - TRACE("iface %p, id %u, index %u, type %p.\n", iface, id, index, type); + TRACE("iface %p, id %lu, index %lu, type %p.\n", iface, id, index, type); if (!decoder->input_type) return MF_E_TRANSFORM_TYPE_NOT_SET; @@ -330,7 +330,7 @@ static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFM HRESULT hr; ULONG i; - TRACE("iface %p, id %u, type %p, flags %#x.\n", iface, id, type, flags); + TRACE("iface %p, id %lu, type %p, flags %#lx.\n", iface, id, type, flags); if (FAILED(hr = IMFMediaType_GetGUID(type, &MF_MT_MAJOR_TYPE, &major)) || FAILED(hr = IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype))) @@ -384,7 +384,7 @@ static HRESULT WINAPI transform_SetOutputType(IMFTransform *iface, DWORD id, IMF GUID major, subtype; HRESULT hr; - TRACE("iface %p, id %u, type %p, flags %#x.\n", iface, id, type, flags); + TRACE("iface %p, id %lu, type %p, flags %#lx.\n", iface, id, type, flags); if (!decoder->input_type) return MF_E_TRANSFORM_TYPE_NOT_SET; @@ -448,19 +448,19 @@ failed: static HRESULT WINAPI transform_GetInputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type) { - FIXME("iface %p, id %u, type %p stub!\n", iface, id, type); + FIXME("iface %p, id %lu, type %p stub!\n", iface, id, type); return E_NOTIMPL; } static HRESULT WINAPI transform_GetOutputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type) { - FIXME("iface %p, id %u, type %p stub!\n", iface, id, type); + FIXME("iface %p, id %lu, type %p stub!\n", iface, id, type); return E_NOTIMPL; } static HRESULT WINAPI transform_GetInputStatus(IMFTransform *iface, DWORD id, DWORD *flags) { - FIXME("iface %p, id %u, flags %p stub!\n", iface, id, flags); + FIXME("iface %p, id %lu, flags %p stub!\n", iface, id, flags); return E_NOTIMPL; } @@ -479,7 +479,7 @@ static HRESULT WINAPI transform_SetOutputBounds(IMFTransform *iface, LONGLONG lo static HRESULT WINAPI transform_ProcessEvent(IMFTransform *iface, DWORD id, IMFMediaEvent *event) { - FIXME("iface %p, id %u, event %p stub!\n", iface, id, event); + FIXME("iface %p, id %lu, event %p stub!\n", iface, id, event); return E_NOTIMPL; } @@ -491,14 +491,14 @@ static HRESULT WINAPI transform_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_ static HRESULT WINAPI transform_ProcessInput(IMFTransform *iface, DWORD id, IMFSample *sample, DWORD flags) { - FIXME("iface %p, id %u, sample %p, flags %#x stub!\n", iface, id, sample, flags); + FIXME("iface %p, id %lu, sample %p, flags %#lx stub!\n", iface, id, sample, flags); return E_NOTIMPL; } static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, DWORD count, MFT_OUTPUT_DATA_BUFFER *samples, DWORD *status) { - FIXME("iface %p, flags %#x, count %u, samples %p, status %p stub!\n", iface, flags, count, samples, status); + FIXME("iface %p, flags %#lx, count %lu, samples %p, status %p stub!\n", iface, flags, count, samples, status); return E_NOTIMPL; } @@ -564,79 +564,79 @@ static HRESULT WINAPI media_object_GetStreamCount(IMediaObject *iface, DWORD *in static HRESULT WINAPI media_object_GetInputStreamInfo(IMediaObject *iface, DWORD index, DWORD *flags) { - FIXME("iface %p, index %u, flags %p stub!\n", iface, index, flags); + FIXME("iface %p, index %lu, flags %p stub!\n", iface, index, flags); return E_NOTIMPL; } static HRESULT WINAPI media_object_GetOutputStreamInfo(IMediaObject *iface, DWORD index, DWORD *flags) { - FIXME("iface %p, index %u, flags %p stub!\n", iface, index, flags); + FIXME("iface %p, index %lu, flags %p stub!\n", iface, index, flags); return E_NOTIMPL; } static HRESULT WINAPI media_object_GetInputType(IMediaObject *iface, DWORD index, DWORD type_index, DMO_MEDIA_TYPE *type) { - FIXME("iface %p, index %u, type_index %u, type %p stub!\n", iface, index, type_index, type); + FIXME("iface %p, index %lu, type_index %lu, type %p stub!\n", iface, index, type_index, type); return E_NOTIMPL; } static HRESULT WINAPI media_object_GetOutputType(IMediaObject *iface, DWORD index, DWORD type_index, DMO_MEDIA_TYPE *type) { - FIXME("iface %p, index %u, type_index %u, type %p stub!\n", iface, index, type_index, type); + FIXME("iface %p, index %lu, type_index %lu, type %p stub!\n", iface, index, type_index, type); return E_NOTIMPL; } static HRESULT WINAPI media_object_SetInputType(IMediaObject *iface, DWORD index, const DMO_MEDIA_TYPE *type, DWORD flags) { - FIXME("iface %p, index %u, type %p, flags %#x stub!\n", iface, index, type, flags); + FIXME("iface %p, index %lu, type %p, flags %#lx stub!\n", iface, index, type, flags); return E_NOTIMPL; } static HRESULT WINAPI media_object_SetOutputType(IMediaObject *iface, DWORD index, const DMO_MEDIA_TYPE *type, DWORD flags) { - FIXME("iface %p, index %u, type %p, flags %#x stub!\n", iface, index, type, flags); + FIXME("iface %p, index %lu, type %p, flags %#lx stub!\n", iface, index, type, flags); return E_NOTIMPL; } static HRESULT WINAPI media_object_GetInputCurrentType(IMediaObject *iface, DWORD index, DMO_MEDIA_TYPE *type) { - FIXME("iface %p, index %u, type %p stub!\n", iface, index, type); + FIXME("iface %p, index %lu, type %p stub!\n", iface, index, type); return E_NOTIMPL; } static HRESULT WINAPI media_object_GetOutputCurrentType(IMediaObject *iface, DWORD index, DMO_MEDIA_TYPE *type) { - FIXME("iface %p, index %u, type %p stub!\n", iface, index, type); + FIXME("iface %p, index %lu, type %p stub!\n", iface, index, type); return E_NOTIMPL; } static HRESULT WINAPI media_object_GetInputSizeInfo(IMediaObject *iface, DWORD index, DWORD *size, DWORD *lookahead, DWORD *alignment) { - FIXME("iface %p, index %u, size %p, lookahead %p, alignment %p stub!\n", iface, index, size, + FIXME("iface %p, index %lu, size %p, lookahead %p, alignment %p stub!\n", iface, index, size, lookahead, alignment); return E_NOTIMPL; } static HRESULT WINAPI media_object_GetOutputSizeInfo(IMediaObject *iface, DWORD index, DWORD *size, DWORD *alignment) { - FIXME("iface %p, index %u, size %p, alignment %p stub!\n", iface, index, size, alignment); + FIXME("iface %p, index %lu, size %p, alignment %p stub!\n", iface, index, size, alignment); return E_NOTIMPL; } static HRESULT WINAPI media_object_GetInputMaxLatency(IMediaObject *iface, DWORD index, REFERENCE_TIME *latency) { - FIXME("iface %p, index %u, latency %p stub!\n", iface, index, latency); + FIXME("iface %p, index %lu, latency %p stub!\n", iface, index, latency); return E_NOTIMPL; } static HRESULT WINAPI media_object_SetInputMaxLatency(IMediaObject *iface, DWORD index, REFERENCE_TIME latency) { - FIXME("iface %p, index %u, latency %s stub!\n", iface, index, wine_dbgstr_longlong(latency)); + FIXME("iface %p, index %lu, latency %s stub!\n", iface, index, wine_dbgstr_longlong(latency)); return E_NOTIMPL; } @@ -648,7 +648,7 @@ static HRESULT WINAPI media_object_Flush(IMediaObject *iface) static HRESULT WINAPI media_object_Discontinuity(IMediaObject *iface, DWORD index) { - FIXME("iface %p, index %u stub!\n", iface, index); + FIXME("iface %p, index %lu stub!\n", iface, index); return E_NOTIMPL; } @@ -666,14 +666,14 @@ static HRESULT WINAPI media_object_FreeStreamingResources(IMediaObject *iface) static HRESULT WINAPI media_object_GetInputStatus(IMediaObject *iface, DWORD index, DWORD *flags) { - FIXME("iface %p, index %u, flags %p stub!\n", iface, index, flags); + FIXME("iface %p, index %lu, flags %p stub!\n", iface, index, flags); return E_NOTIMPL; } static HRESULT WINAPI media_object_ProcessInput(IMediaObject *iface, DWORD index, IMediaBuffer *buffer, DWORD flags, REFERENCE_TIME timestamp, REFERENCE_TIME timelength) { - FIXME("iface %p, index %u, buffer %p, flags %#x, timestamp %s, timelength %s stub!\n", iface, + FIXME("iface %p, index %lu, buffer %p, flags %#lx, timestamp %s, timelength %s stub!\n", iface, index, buffer, flags, wine_dbgstr_longlong(timestamp), wine_dbgstr_longlong(timelength)); return E_NOTIMPL; } @@ -681,13 +681,13 @@ static HRESULT WINAPI media_object_ProcessInput(IMediaObject *iface, DWORD index static HRESULT WINAPI media_object_ProcessOutput(IMediaObject *iface, DWORD flags, DWORD count, DMO_OUTPUT_DATA_BUFFER *buffers, DWORD *status) { - FIXME("iface %p, flags %#x, count %u, buffers %p, status %p stub!\n", iface, flags, count, buffers, status); + FIXME("iface %p, flags %#lx, count %lu, buffers %p, status %p stub!\n", iface, flags, count, buffers, status); return E_NOTIMPL; } static HRESULT WINAPI media_object_Lock(IMediaObject *iface, LONG lock) { - FIXME("iface %p, lock %d stub!\n", iface, lock); + FIXME("iface %p, lock %ld stub!\n", iface, lock); return E_NOTIMPL; } -- 2.34.1
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/mfplat.c | 10 +++++----- dlls/winegstreamer/wma_decoder.c | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index aa5e60ec116..a111bbe196d 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -437,21 +437,21 @@ HRESULT mfplat_get_class_object(REFCLSID rclsid, REFIID riid, void **obj) } static WCHAR audio_converterW[] = L"Audio Converter"; -static const GUID *audio_converter_supported_types[] = +static const GUID *const audio_converter_supported_types[] = { &MFAudioFormat_PCM, &MFAudioFormat_Float, }; static WCHAR wma_decoderW[] = L"WMAudio Decoder MFT"; -static const GUID *wma_decoder_input_types[] = +static const GUID *const wma_decoder_input_types[] = { &MEDIASUBTYPE_MSAUDIO1, &MFAudioFormat_WMAudioV8, &MFAudioFormat_WMAudioV9, &MFAudioFormat_WMAudio_Lossless, }; -static const GUID *wma_decoder_output_types[] = +static const GUID *const wma_decoder_output_types[] = { &MFAudioFormat_PCM, &MFAudioFormat_Float, @@ -465,9 +465,9 @@ static const struct mft const UINT32 flags; const GUID *major_type; const UINT32 input_types_count; - const GUID **input_types; + const GUID *const *input_types; const UINT32 output_types_count; - const GUID **output_types; + const GUID *const *output_types; } mfts[] = { diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c index 945390f44db..78316059052 100644 --- a/dlls/winegstreamer/wma_decoder.c +++ b/dlls/winegstreamer/wma_decoder.c @@ -30,14 +30,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmadec); -static const GUID *wma_decoder_input_types[] = +static const GUID *const wma_decoder_input_types[] = { &MEDIASUBTYPE_MSAUDIO1, &MFAudioFormat_WMAudioV8, &MFAudioFormat_WMAudioV9, &MFAudioFormat_WMAudio_Lossless, }; -static const GUID *wma_decoder_output_types[] = +static const GUID *const wma_decoder_output_types[] = { &MFAudioFormat_Float, &MFAudioFormat_PCM, -- 2.34.1
participants (1)
-
Zebediah Figura