system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 17:24:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

quartz: Build without -DWINE_NO_LONG_TYPES.

Browse source 
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2022-02-04 15:41:27 -06:00 committed by Alexandre Julliard
parent deb6096775
commit 4364ff8d5c
15 changed files with 387 additions and 398 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dlls/quartz/Makefile.in
View file

@ -1,4 +1,3 @@
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = quartz.dll
IMPORTLIB = quartz
IMPORTS = strmiids dxguid strmbase uuid dsound msacm32 msvfw32 ole32 oleaut32 rpcrt4 user32 gdi32 advapi32

18
dlls/quartz/acmwrapper.c
View file

@ -110,7 +110,7 @@ static HRESULT WINAPI acm_wrapper_sink_Receive(struct strmbase_sink *iface, IMed
hr = IMediaSample_GetPointer(pSample, &pbSrcStream);
if (FAILED(hr))
{
ERR("Cannot get pointer to sample data (%x)\n", hr);
ERR("Failed to get input buffer pointer, hr %#lx.\n", hr);
return hr;
}
@ -135,8 +135,6 @@ static HRESULT WINAPI acm_wrapper_sink_Receive(struct strmbase_sink *iface, IMed
tMed = tStart;
mtMed = mtStart;
TRACE("Sample data ptr = %p, size = %d\n", pbSrcStream, cbSrcStream);
ash.pbSrc = pbSrcStream;
ash.cbSrcLength = cbSrcStream;
@ -145,7 +143,7 @@ static HRESULT WINAPI acm_wrapper_sink_Receive(struct strmbase_sink *iface, IMed
hr = BaseOutputPinImpl_GetDeliveryBuffer(&This->source, &pOutSample, NULL, NULL, 0);
if (FAILED(hr))
{
ERR("Unable to get delivery buffer (%x)\n", hr);
ERR("Failed to get sample, hr %#lx.\n", hr);
return hr;
}
IMediaSample_SetPreroll(pOutSample, preroll);
@ -155,7 +153,7 @@ static HRESULT WINAPI acm_wrapper_sink_Receive(struct strmbase_sink *iface, IMed
hr = IMediaSample_GetPointer(pOutSample, &pbDstStream);
if (FAILED(hr)) {
ERR("Unable to get pointer to buffer (%x)\n", hr);
ERR("Failed to get output buffer pointer, hr %#lx.\n", hr);
goto error;
}
cbDstStream = IMediaSample_GetSize(pOutSample);
@ -192,7 +190,7 @@ static HRESULT WINAPI acm_wrapper_sink_Receive(struct strmbase_sink *iface, IMed
goto error;
}
TRACE("used in %u/%u, used out %u/%u\n", ash.cbSrcLengthUsed, ash.cbSrcLength, ash.cbDstLengthUsed, ash.cbDstLength);
TRACE("used in %lu/%lu, used out %lu/%lu\n", ash.cbSrcLengthUsed, ash.cbSrcLength, ash.cbDstLengthUsed, ash.cbDstLength);
hr = IMediaSample_SetActualDataLength(pOutSample, ash.cbDstLengthUsed);
assert(hr == S_OK);
@ -200,7 +198,7 @@ static HRESULT WINAPI acm_wrapper_sink_Receive(struct strmbase_sink *iface, IMed
/* Bug in acm codecs? It apparently uses the input, but doesn't necessarily output immediately */
if (!ash.cbSrcLengthUsed)
{
WARN("Sample was skipped? Outputted: %u\n", ash.cbDstLengthUsed);
WARN("Sample was skipped? Outputted: %lu\n", ash.cbDstLengthUsed);
ash.cbSrcLength = 0;
goto error;
}
@ -243,7 +241,7 @@ static HRESULT WINAPI acm_wrapper_sink_Receive(struct strmbase_sink *iface, IMed
hr = IMemInputPin_Receive(This->source.pMemInputPin, pOutSample);
if (hr != S_OK && hr != VFW_E_NOT_CONNECTED) {
if (FAILED(hr))
ERR("Error sending sample (%x)\n", hr);
ERR("Failed to send sample, hr %#lx.\n", hr);
goto error;
}
@ -419,7 +417,7 @@ static HRESULT WINAPI acm_wrapper_source_qc_Notify(IQualityControl *iface,
IQualityControl *peer;
HRESULT hr = S_OK;
TRACE("filter %p, sender %p, type %#x, proportion %u, late %s, timestamp %s.\n",
TRACE("filter %p, sender %p, type %#x, proportion %ld, late %s, timestamp %s.\n",
filter, sender, q.Type, q.Proportion, debugstr_time(q.Late), debugstr_time(q.TimeStamp));
if (filter->source_qc_sink)
@ -492,7 +490,7 @@ static HRESULT acm_wrapper_init_stream(struct strmbase_filter *iface)
HRESULT hr;
if (filter->source.pin.peer && FAILED(hr = IMemAllocator_Commit(filter->source.pAllocator)))
ERR("Failed to commit allocator, hr %#x.\n", hr);
ERR("Failed to commit allocator, hr %#lx.\n", hr);
return S_OK;
}

31
dlls/quartz/avidec.c
View file

@ -101,14 +101,13 @@ static HRESULT WINAPI avi_decompressor_sink_Receive(struct strmbase_sink *iface,
struct avi_decompressor *This = impl_from_strmbase_filter(iface->pin.filter);
VIDEOINFOHEADER *source_format;
HRESULT hr;
DWORD res;
IMediaSample* pOutSample = NULL;
DWORD cbDstStream;
LONG cbDstStream, cbSrcStream;
LPBYTE pbDstStream;
DWORD cbSrcStream;
LPBYTE pbSrcStream;
LONGLONG tStart, tStop;
DWORD flags = 0;
LRESULT res;
/* We do not expect pin connection state to change while the filter is
* running. This guarantee is necessary, since otherwise we would have to
@ -131,20 +130,18 @@ static HRESULT WINAPI avi_decompressor_sink_Receive(struct strmbase_sink *iface,
hr = IMediaSample_GetPointer(pSample, &pbSrcStream);
if (FAILED(hr))
{
ERR("Cannot get pointer to sample data (%x)\n", hr);
ERR("Failed to get input buffer pointer, hr %#lx.\n", hr);
return hr;
}
cbSrcStream = IMediaSample_GetActualDataLength(pSample);
TRACE("Sample data ptr = %p, size = %d\n", pbSrcStream, cbSrcStream);
/* Update input size to match sample size */
This->pBihIn->biSizeImage = cbSrcStream;
hr = BaseOutputPinImpl_GetDeliveryBuffer(&This->source, &pOutSample, NULL, NULL, 0);
if (FAILED(hr)) {
ERR("Unable to get delivery buffer (%x)\n", hr);
ERR("Failed to get sample, hr %#lx.\n", hr);
return hr;
}
@ -153,14 +150,14 @@ static HRESULT WINAPI avi_decompressor_sink_Receive(struct strmbase_sink *iface,
hr = IMediaSample_GetPointer(pOutSample, &pbDstStream);
if (FAILED(hr)) {
ERR("Unable to get pointer to buffer (%x)\n", hr);
ERR("Failed to get output buffer pointer, hr %#lx.\n", hr);
IMediaSample_Release(pOutSample);
return hr;
}
cbDstStream = IMediaSample_GetSize(pOutSample);
if (cbDstStream < source_format->bmiHeader.biSizeImage)
{
ERR("Sample size is too small (%u < %u).\n", cbDstStream, source_format->bmiHeader.biSizeImage);
ERR("Sample size is too small (%ld < %lu).\n", cbDstStream, source_format->bmiHeader.biSizeImage);
IMediaSample_Release(pOutSample);
return E_FAIL;
}
@ -175,7 +172,7 @@ static HRESULT WINAPI avi_decompressor_sink_Receive(struct strmbase_sink *iface,
res = ICDecompress(This->hvid, flags, This->pBihIn, pbSrcStream, &source_format->bmiHeader, pbDstStream);
if (res != ICERR_OK)
ERR("Error occurred during the decompression (%x)\n", res);
ERR("Failed to decompress, error %Id.\n", res);
/* Drop sample if it's intended to be dropped */
if (flags & ICDECOMPRESS_HURRYUP) {
@ -198,7 +195,7 @@ static HRESULT WINAPI avi_decompressor_sink_Receive(struct strmbase_sink *iface,
hr = IMemInputPin_Receive(This->source.pMemInputPin, pOutSample);
if (hr != S_OK && hr != VFW_E_NOT_CONNECTED)
ERR("Error sending sample (%x)\n", hr);
ERR("Failed to send sample, hr %#lx.\n", hr);
IMediaSample_Release(pOutSample);
return hr;
@ -228,7 +225,7 @@ static HRESULT avi_decompressor_sink_connect(struct strmbase_sink *iface, IPin *
if (This->hvid)
{
DWORD bih_size;
DWORD result;
LRESULT result;
/* Copy bitmap header from media type to 1 for input and 1 for output */
bih_size = bmi->biSize + bmi->biClrUsed * 4;
@ -242,7 +239,7 @@ static HRESULT avi_decompressor_sink_connect(struct strmbase_sink *iface, IPin *
if ((result = ICDecompressQuery(This->hvid, This->pBihIn, NULL)))
{
WARN("No decompressor found, error %d.\n", result);
WARN("No decompressor found, error %Id.\n", result);
return VFW_E_TYPE_NOT_ACCEPTED;
}
@ -479,7 +476,7 @@ static HRESULT WINAPI avi_decompressor_source_qc_Notify(IQualityControl *iface,
{
struct avi_decompressor *filter = impl_from_source_IQualityControl(iface);
TRACE("filter %p, sender %p, type %#x, proportion %u, late %s, timestamp %s.\n",
TRACE("filter %p, sender %p, type %#x, proportion %ld, late %s, timestamp %s.\n",
filter, sender, q.Type, q.Proportion, debugstr_time(q.Late), debugstr_time(q.TimeStamp));
EnterCriticalSection(&filter->filter.stream_cs);
@ -555,12 +552,12 @@ static HRESULT avi_decompressor_init_stream(struct strmbase_filter *iface)
source_format = (VIDEOINFOHEADER *)filter->sink.pin.mt.pbFormat;
if ((res = ICDecompressBegin(filter->hvid, filter->pBihIn, &source_format->bmiHeader)))
{
ERR("ICDecompressBegin() failed, error %ld.\n", res);
ERR("ICDecompressBegin() failed, error %Id.\n", res);
return E_FAIL;
}
if (FAILED(hr = IMemAllocator_Commit(filter->source.pAllocator)))
ERR("Failed to commit allocator, hr %#x.\n", hr);
ERR("Failed to commit allocator, hr %#lx.\n", hr);
return S_OK;
}
@ -575,7 +572,7 @@ static HRESULT avi_decompressor_cleanup_stream(struct strmbase_filter *iface)
if (filter->hvid && (res = ICDecompressEnd(filter->hvid)))
{
ERR("ICDecompressEnd() failed, error %ld.\n", res);
ERR("ICDecompressEnd() failed, error %Id.\n", res);
return E_FAIL;
}

40
dlls/quartz/dsoundrender.c
View file

@ -126,7 +126,7 @@ static void DSoundRender_UpdatePositions(struct dsound_render *This, DWORD *seqw
adv = playpos - old_playpos;
This->last_playpos = playpos;
if (adv) {
TRACE("Moving from %u to %u: clearing %u bytes\n", old_playpos, playpos, adv);
TRACE("Moving from %lu to %lu: clearing %lu bytes.\n", old_playpos, playpos, adv);
IDirectSoundBuffer_Lock(This->dsbuffer, old_playpos, adv, (void**)&buf1, &size1, (void**)&buf2, &size2, 0);
memset(buf1, wfx->wBitsPerSample == 8 ? 128 : 0, size1);
memset(buf2, wfx->wBitsPerSample == 8 ? 128 : 0, size2);
@ -190,19 +190,19 @@ static HRESULT DSoundRender_GetWritePos(struct dsound_render *This,
past = min_writepos_t - write_at;
if (past >= 0) {
DWORD skipbytes = pos_from_time(This, past);
WARN("Skipping %u bytes\n", skipbytes);
WARN("Skipping %lu bytes.\n", skipbytes);
*skip = skipbytes;
*ret_writepos = min_writepos;
} else {
DWORD aheadbytes = pos_from_time(This, -past);
WARN("Advancing %u bytes\n", aheadbytes);
WARN("Advancing %lu bytes.\n", aheadbytes);
*ret_writepos = (min_writepos + aheadbytes) % This->buf_size;
}
} else /* delta_t > 0 */ {
DWORD aheadbytes;
WARN("Delta too big %s/%s, too far ahead\n", debugstr_time(delta_t), debugstr_time(max_lag));
aheadbytes = pos_from_time(This, delta_t);
WARN("Advancing %u bytes\n", aheadbytes);
WARN("Advancing %lu bytes.\n", aheadbytes);
if (delta_t >= DSoundRenderer_Max_Fill)
return S_FALSE;
*ret_writepos = (min_writepos + aheadbytes) % This->buf_size;
@ -254,13 +254,13 @@ static HRESULT DSoundRender_SendSampleData(struct dsound_render *This,
if (This->sink.flushing || This->filter.state == State_Stopped)
return This->filter.state == State_Paused ? S_OK : VFW_E_WRONG_STATE;
if (ret != WAIT_TIMEOUT)
ERR("%x\n", ret);
ERR("WaitForSingleObject() returned %ld.\n", ret);
continue;
}
tStart = -1;
if (skip)
FIXME("Sample dropped %u of %u bytes\n", skip, size);
FIXME("Sample dropped %lu of %lu bytes.\n", skip, size);
if (skip >= size)
return S_OK;
data += skip;
@ -268,7 +268,7 @@ static HRESULT DSoundRender_SendSampleData(struct dsound_render *This,
hr = IDirectSoundBuffer_Lock(This->dsbuffer, writepos, min(free, size), (void**)&buf1, &size1, (void**)&buf2, &size2, 0);
if (hr != DS_OK) {
ERR("Unable to lock sound buffer! (%x)\n", hr);
ERR("Failed to lock sound buffer, hr %#lx.\n", hr);
break;
}
memcpy(buf1, data, size1);
@ -276,7 +276,7 @@ static HRESULT DSoundRender_SendSampleData(struct dsound_render *This,
memcpy(buf2, data+size1, size2);
IDirectSoundBuffer_Unlock(This->dsbuffer, buf1, size1, buf2, size2);
This->writepos = (writepos + size1 + size2) % This->buf_size;
TRACE("Wrote %u bytes at %u, next at %u - (%u/%u)\n", size1+size2, writepos, This->writepos, free, size);
TRACE("Wrote %lu bytes at %lu, next at %lu - (%lu/%lu)\n", size1+size2, writepos, This->writepos, free, size);
data += size1 + size2;
size -= size1 + size2;
}
@ -330,13 +330,13 @@ static HRESULT DSoundRender_DoRenderSample(struct dsound_render *This, IMediaSam
hr = IMediaSample_GetPointer(pSample, &pbSrcStream);
if (FAILED(hr))
{
ERR("Cannot get pointer to sample data (%x)\n", hr);
ERR("Failed to get buffer pointer, hr %#lx.\n", hr);
return hr;
}
hr = IMediaSample_GetTime(pSample, &tStart, &tStop);
if (FAILED(hr)) {
ERR("Cannot get sample time (%x)\n", hr);
ERR("Failed to get sample time, hr %#lx.\n", hr);
tStart = tStop = -1;
}
@ -347,8 +347,6 @@ static HRESULT DSoundRender_DoRenderSample(struct dsound_render *This, IMediaSam
}
cbSrcStream = IMediaSample_GetActualDataLength(pSample);
TRACE("Sample data ptr = %p, size = %d\n", pbSrcStream, cbSrcStream);
return DSoundRender_SendSampleData(This, tStart, tStop, pbSrcStream, cbSrcStream);
}
@ -416,17 +414,17 @@ static HRESULT dsound_render_sink_connect(struct strmbase_sink *iface, IPin *pee
hr = IDirectSound8_CreateSoundBuffer(This->dsound, &buf_desc, &This->dsbuffer, NULL);
This->writepos = This->buf_size;
if (FAILED(hr))
ERR("Can't create sound buffer (%x)\n", hr);
ERR("Failed to create sound buffer, hr %#lx.\n", hr);
if (SUCCEEDED(hr))
{
hr = IDirectSoundBuffer_SetVolume(This->dsbuffer, This->volume);
if (FAILED(hr))
ERR("Can't set volume to %d (%x)\n", This->volume, hr);
ERR("Failed to set volume to %ld, hr %#lx.\n", This->volume, hr);
hr = IDirectSoundBuffer_SetPan(This->dsbuffer, This->pan);
if (FAILED(hr))
ERR("Can't set pan to %d (%x)\n", This->pan, hr);
ERR("Failed to set pan to %ld, hr %#lx.\n", This->pan, hr);
hr = S_OK;
}
@ -701,7 +699,7 @@ HRESULT WINAPI basic_audio_GetTypeInfoCount(IBasicAudio *iface, UINT *count)
HRESULT WINAPI basic_audio_GetTypeInfo(IBasicAudio *iface, UINT index,
LCID lcid, ITypeInfo **typeinfo)
{
TRACE("iface %p, index %u, lcid %#x, typeinfo %p.\n", iface, index, lcid, typeinfo);
TRACE("iface %p, index %u, lcid %#lx, typeinfo %p.\n", iface, index, lcid, typeinfo);
return strmbase_get_typeinfo(IBasicAudio_tid, typeinfo);
}
@ -711,7 +709,7 @@ HRESULT WINAPI basic_audio_GetIDsOfNames(IBasicAudio *iface, REFIID iid,
ITypeInfo *typeinfo;
HRESULT hr;
TRACE("iface %p, iid %s, names %p, count %u, lcid %#x, ids %p.\n",
TRACE("iface %p, iid %s, names %p, count %u, lcid %#lx, ids %p.\n",
iface, debugstr_guid(iid), names, count, lcid, ids);
if (SUCCEEDED(hr = strmbase_get_typeinfo(IBasicAudio_tid, &typeinfo)))
@ -728,7 +726,7 @@ static HRESULT WINAPI basic_audio_Invoke(IBasicAudio *iface, DISPID id, REFIID i
ITypeInfo *typeinfo;
HRESULT hr;
TRACE("iface %p, id %d, iid %s, lcid %#x, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n",
TRACE("iface %p, id %ld, iid %s, lcid %#lx, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n",
iface, id, debugstr_guid(iid), lcid, flags, params, result, excepinfo, error_arg);
if (SUCCEEDED(hr = strmbase_get_typeinfo(IBasicAudio_tid, &typeinfo)))
@ -743,7 +741,7 @@ static HRESULT WINAPI Basicaudio_put_Volume(IBasicAudio *iface,
LONG lVolume) {
struct dsound_render *This = impl_from_IBasicAudio(iface);
TRACE("(%p/%p)->(%d)\n", This, iface, lVolume);
TRACE("filter %p, volume %ld.\n", This, lVolume);
if (lVolume > DSBVOLUME_MAX || lVolume < DSBVOLUME_MIN)
return E_INVALIDARG;
@ -774,7 +772,7 @@ static HRESULT WINAPI Basicaudio_put_Balance(IBasicAudio *iface,
LONG lBalance) {
struct dsound_render *This = impl_from_IBasicAudio(iface);
TRACE("(%p/%p)->(%d)\n", This, iface, lBalance);
TRACE("filter %p, balance %ld.\n", This, lBalance);
if (lBalance < DSBPAN_LEFT || lBalance > DSBPAN_RIGHT)
return E_INVALIDARG;
@ -963,7 +961,7 @@ static HRESULT WINAPI dsound_render_qc_Notify(IQualityControl *iface,
{
struct dsound_render *filter = impl_from_IQualityControl(iface);
FIXME("filter %p, sender %p, type %#x, proportion %u, late %s, timestamp %s, stub!\n",
FIXME("filter %p, sender %p, type %#x, proportion %ld, late %s, timestamp %s, stub!\n",
filter, sender, q.Type, q.Proportion, debugstr_time(q.Late), debugstr_time(q.TimeStamp));
return E_NOTIMPL;

15
dlls/quartz/filesource.c
View file

@ -217,7 +217,7 @@ BOOL get_media_type(const WCHAR *filename, GUID *majortype, GUID *subtype, GUID
if ((file = CreateFileW(filename, GENERIC_READ, FILE_SHARE_READ, NULL,
OPEN_EXISTING, 0, NULL)) == INVALID_HANDLE_VALUE)
{
WARN("Failed to open file %s, error %u.\n", debugstr_w(filename), GetLastError());
WARN("Failed to open file %s, error %lu.\n", debugstr_w(filename), GetLastError());
return FALSE;
}
@ -393,14 +393,14 @@ static DWORD CALLBACK io_thread(void *arg)
EnterCriticalSection(&filter->sample_cs);
req = CONTAINING_RECORD(ovl, struct request, ovl);
TRACE("Got sample %u.\n", req - filter->requests);
TRACE("Got sample %Iu.\n", req - filter->requests);
assert(req >= filter->requests && req < filter->requests + filter->max_requests);
if (ret)
WakeConditionVariable(&filter->sample_cv);
else
{
ERR("GetQueuedCompletionStatus() returned failure, error %u.\n", GetLastError());
ERR("GetQueuedCompletionStatus() returned failure, error %lu.\n", GetLastError());
req->sample = NULL;
}
@ -624,7 +624,6 @@ static HRESULT WINAPI FileAsyncReaderPin_AttemptConnection(struct strmbase_sourc
FreeMediaType(&This->pin.mt);
}
TRACE(" -- %x\n", hr);
return hr;
}
@ -712,7 +711,7 @@ static HRESULT WINAPI FileAsyncReader_Request(IAsyncReader *iface, IMediaSample
HRESULT hr;
BYTE *data;
TRACE("filter %p, sample %p, cookie %#lx.\n", filter, sample, cookie);
TRACE("filter %p, sample %p, cookie %#Ix.\n", filter, sample, cookie);
if (!sample)
return E_POINTER;
@ -765,7 +764,7 @@ static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader *iface,
struct async_reader *filter = impl_from_IAsyncReader(iface);
unsigned int i;
TRACE("filter %p, timeout %u, sample %p, cookie %p.\n", filter, timeout, sample, cookie);
TRACE("filter %p, timeout %lu, sample %p, cookie %p.\n", filter, timeout, sample, cookie);
*sample = NULL;
*cookie = 0;
@ -824,7 +823,7 @@ static BOOL sync_read(HANDLE file, LONGLONG offset, LONG length, BYTE *buffer, D
if (ret || GetLastError() == ERROR_IO_PENDING)
ret = GetOverlappedResult(file, &ovl, read_len, TRUE);
TRACE("Returning %u bytes.\n", *read_len);
TRACE("Returning %lu bytes.\n", *read_len);
CloseHandle(ovl.hEvent);
return ret;
@ -873,7 +872,7 @@ static HRESULT WINAPI FileAsyncReader_SyncRead(IAsyncReader *iface,
HRESULT hr;
BOOL ret;
TRACE("filter %p, offset %s, length %d, buffer %p.\n",
TRACE("filter %p, offset %s, length %ld, buffer %p.\n",
filter, wine_dbgstr_longlong(offset), length, buffer);
ret = sync_read(filter->file, offset, length, buffer, &read_len);

296
dlls/quartz/filtergraph.c
View file

@ -98,7 +98,7 @@ struct filter_graph
struct list filters;
unsigned int name_index;
OAFilterState state;
FILTER_STATE state;
TP_WORK *async_run_work;
IReferenceClock *refClock;
@ -181,7 +181,7 @@ static ULONG WINAPI EnumFilters_AddRef(IEnumFilters *iface)
struct enum_filters *enum_filters = impl_from_IEnumFilters(iface);
ULONG ref = InterlockedIncrement(&enum_filters->ref);
TRACE("%p increasing refcount to %u.\n", enum_filters, ref);
TRACE("%p increasing refcount to %lu.\n", enum_filters, ref);
return ref;
}
@ -191,7 +191,7 @@ static ULONG WINAPI EnumFilters_Release(IEnumFilters *iface)
struct enum_filters *enum_filters = impl_from_IEnumFilters(iface);
ULONG ref = InterlockedDecrement(&enum_filters->ref);
TRACE("%p decreasing refcount to %u.\n", enum_filters, ref);
TRACE("%p decreasing refcount to %lu.\n", enum_filters, ref);
if (!ref)
{
@ -208,7 +208,7 @@ static HRESULT WINAPI EnumFilters_Next(IEnumFilters *iface, ULONG count,
struct enum_filters *enum_filters = impl_from_IEnumFilters(iface);
unsigned int i = 0;
TRACE("enum_filters %p, count %u, filters %p, fetched %p.\n",
TRACE("enum_filters %p, count %lu, filters %p, fetched %p.\n",
enum_filters, count, filters, fetched);
if (enum_filters->version != enum_filters->graph->version)
@ -238,7 +238,7 @@ static HRESULT WINAPI EnumFilters_Skip(IEnumFilters *iface, ULONG count)
{
struct enum_filters *enum_filters = impl_from_IEnumFilters(iface);
TRACE("enum_filters %p, count %u.\n", enum_filters, count);
TRACE("enum_filters %p, count %lu.\n", enum_filters, count);
if (enum_filters->version != enum_filters->graph->version)
return VFW_E_ENUM_OUT_OF_SYNC;
@ -418,23 +418,24 @@ static HRESULT WINAPI FilterGraphInner_QueryInterface(IUnknown *iface, REFIID ri
static ULONG WINAPI FilterGraphInner_AddRef(IUnknown *iface)
{
struct filter_graph *This = impl_from_IUnknown(iface);
ULONG ref = InterlockedIncrement(&This->ref);
struct filter_graph *graph = impl_from_IUnknown(iface);
ULONG refcount = InterlockedIncrement(&graph->ref);
TRACE("(%p)->(): new ref = %d\n", This, ref);
TRACE("%p increasing refcount to %lu.\n", graph, refcount);
return ref;
return refcount;
}
static ULONG WINAPI FilterGraphInner_Release(IUnknown *iface)
{
struct filter_graph *This = impl_from_IUnknown(iface);
ULONG ref = InterlockedDecrement(&This->ref);
ULONG refcount = InterlockedDecrement(&This->ref);
struct list *cursor;
TRACE("(%p)->(): new ref = %d\n", This, ref);
TRACE("%p decreasing refcount to %lu.\n", This, refcount);
if (ref == 0) {
if (!refcount)
{
int i;
This->ref = 1; /* guard against reentrancy (aggregation). */
@ -476,7 +477,7 @@ static ULONG WINAPI FilterGraphInner_Release(IUnknown *iface)
DeleteCriticalSection(&This->cs);
free(This);
}
return ref;
return refcount;
}
static struct filter_graph *impl_from_IFilterGraph2(IFilterGraph2 *iface)
@ -694,7 +695,7 @@ static HRESULT WINAPI FilterGraph2_RemoveFilter(IFilterGraph2 *iface, IBaseFilte
{
if (FAILED(hr = IPin_Disconnect(peer)))
{
WARN("Failed to disconnect peer %p, hr %#x.\n", peer, hr);
WARN("Failed to disconnect peer %p, hr %#lx.\n", peer, hr);
IPin_Release(peer);
IPin_Release(ppin);
IEnumPins_Release(penumpins);
@ -704,7 +705,7 @@ static HRESULT WINAPI FilterGraph2_RemoveFilter(IFilterGraph2 *iface, IBaseFilte
if (FAILED(hr = IPin_Disconnect(ppin)))
{
WARN("Failed to disconnect pin %p, hr %#x.\n", ppin, hr);
WARN("Failed to disconnect pin %p, hr %#lx.\n", ppin, hr);
IPin_Release(ppin);
IEnumPins_Release(penumpins);
return hr;
@ -781,7 +782,7 @@ static HRESULT check_cyclic_connection(IPin *source, IPin *sink)
hr = IPin_QueryPinInfo(sink, &sink_info);
if (FAILED(hr))
{
ERR("Failed to query pin, hr %#x.\n", hr);
ERR("Failed to query pin, hr %#lx.\n", hr);
return hr;
}
IBaseFilter_Release(sink_info.pFilter);
@ -789,7 +790,7 @@ static HRESULT check_cyclic_connection(IPin *source, IPin *sink)
hr = IPin_QueryPinInfo(source, &source_info);
if (FAILED(hr))
{
ERR("Failed to query pin, hr %#x.\n", hr);
ERR("Failed to query pin, hr %#lx.\n", hr);
return hr;
}
@ -803,7 +804,7 @@ static HRESULT check_cyclic_connection(IPin *source, IPin *sink)
hr = IBaseFilter_EnumPins(source_info.pFilter, &enumpins);
if (FAILED(hr))
{
ERR("Failed to enumerate pins, hr %#x.\n", hr);
ERR("Failed to enumerate pins, hr %#lx.\n", hr);
IBaseFilter_Release(source_info.pFilter);
return hr;
}
@ -1264,7 +1265,7 @@ static HRESULT autoplug(struct filter_graph *graph, IPin *source, IPin *sink,
if (callback && FAILED(hr = IAMGraphBuilderCallback_SelectedFilter(callback, moniker)))
{
TRACE("Filter rejected by IAMGraphBuilderCallback::SelectedFilter(), hr %#x.\n", hr);
TRACE("Filter rejected by IAMGraphBuilderCallback::SelectedFilter(), hr %#lx.\n", hr);
IMoniker_Release(moniker);
continue;
}
@ -1273,14 +1274,14 @@ static HRESULT autoplug(struct filter_graph *graph, IPin *source, IPin *sink,
IMoniker_Release(moniker);
if (FAILED(hr))
{
ERR("Failed to create filter for %s, hr %#x.\n", debugstr_w(V_BSTR(&var)), hr);
ERR("Failed to create filter for %s, hr %#lx.\n", debugstr_w(V_BSTR(&var)), hr);
VariantClear(&var);
continue;
}
if (callback && FAILED(hr = IAMGraphBuilderCallback_CreatedFilter(callback, filter)))
{
TRACE("Filter rejected by IAMGraphBuilderCallback::CreatedFilter(), hr %#x.\n", hr);
TRACE("Filter rejected by IAMGraphBuilderCallback::CreatedFilter(), hr %#lx.\n", hr);
IBaseFilter_Release(filter);
continue;
}
@ -1289,7 +1290,7 @@ static HRESULT autoplug(struct filter_graph *graph, IPin *source, IPin *sink,
VariantClear(&var);
if (FAILED(hr))
{
ERR("Failed to add filter, hr %#x.\n", hr);
ERR("Failed to add filter, hr %#lx.\n", hr);
IBaseFilter_Release(filter);
continue;
}
@ -1347,7 +1348,7 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *source, I
LeaveCriticalSection(&graph->cs);
TRACE("Returning %#x.\n", hr);
TRACE("Returning %#lx.\n", hr);
return hr;
}
@ -1364,7 +1365,7 @@ static HRESULT WINAPI FilterGraph2_Render(IFilterGraph2 *iface, IPin *source)
if (hr == VFW_E_CANNOT_CONNECT)
hr = VFW_E_CANNOT_RENDER;
TRACE("Returning %#x.\n", hr);
TRACE("Returning %#lx.\n", hr);
return hr;
}
@ -1417,7 +1418,7 @@ static HRESULT WINAPI FilterGraph2_RenderFile(IFilterGraph2 *iface, LPCWSTR lpcw
if (!any)
{
if (FAILED(hr = IFilterGraph2_RemoveFilter(iface, preader)))
ERR("Failed to remove source filter, hr %#x.\n", hr);
ERR("Failed to remove source filter, hr %#lx.\n", hr);
hr = VFW_E_CANNOT_RENDER;
}
else if (partial)
@ -1431,7 +1432,7 @@ static HRESULT WINAPI FilterGraph2_RenderFile(IFilterGraph2 *iface, LPCWSTR lpcw
}
IBaseFilter_Release(preader);
TRACE("--> %08x\n", hr);
TRACE("Returning %#lx.\n", hr);
return hr;
}
@ -1454,13 +1455,13 @@ static HRESULT WINAPI FilterGraph2_AddSourceFilter(IFilterGraph2 *iface,
if (FAILED(hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER,
&IID_IBaseFilter, (void **)&filter)))
{
WARN("Failed to create filter, hr %#x.\n", hr);
WARN("Failed to create filter, hr %#lx.\n", hr);
return hr;
}
if (FAILED(hr = IBaseFilter_QueryInterface(filter, &IID_IFileSourceFilter, (void **)&filesource)))
{
WARN("Failed to get IFileSourceFilter, hr %#x.\n", hr);
WARN("Failed to get IFileSourceFilter, hr %#lx.\n", hr);
IBaseFilter_Release(filter);
return hr;
}
@ -1469,7 +1470,7 @@ static HRESULT WINAPI FilterGraph2_AddSourceFilter(IFilterGraph2 *iface,
IFileSourceFilter_Release(filesource);
if (FAILED(hr))
{
WARN("Failed to load file, hr %#x.\n", hr);
WARN("Failed to load file, hr %#lx.\n", hr);
return hr;
}
@ -1484,11 +1485,11 @@ static HRESULT WINAPI FilterGraph2_AddSourceFilter(IFilterGraph2 *iface,
return S_OK;
}
static HRESULT WINAPI FilterGraph2_SetLogFile(IFilterGraph2 *iface, DWORD_PTR hFile)
static HRESULT WINAPI FilterGraph2_SetLogFile(IFilterGraph2 *iface, DWORD_PTR file)
{
struct filter_graph *This = impl_from_IFilterGraph2(iface);
struct filter_graph *graph = impl_from_IFilterGraph2(iface);
TRACE("(%p/%p)->(%08x): stub !!!\n", This, iface, (DWORD) hFile);
TRACE("graph %p, file %#Ix.\n", graph, file);
return S_OK;
}
@ -1523,13 +1524,13 @@ static HRESULT WINAPI FilterGraph2_AddSourceFilterForMoniker(IFilterGraph2 *ifac
hr = IMoniker_BindToObject(pMoniker, pCtx, NULL, &IID_IBaseFilter, (void**)&pfilter);
if(FAILED(hr)) {
WARN("Unable to bind moniker to filter object (%x)\n", hr);
WARN("Failed to bind moniker, hr %#lx.\n", hr);
return hr;
}
hr = IFilterGraph2_AddFilter(iface, pfilter, lpcwstrFilterName);
if (FAILED(hr)) {
WARN("Unable to add filter (%x)\n", hr);
WARN("Failed to add filter, hr %#lx.\n", hr);
IBaseFilter_Release(pfilter);
return hr;
}
@ -1571,10 +1572,10 @@ static HRESULT WINAPI FilterGraph2_RenderEx(IFilterGraph2 *iface, IPin *source,
struct filter_graph *graph = impl_from_IFilterGraph2(iface);
HRESULT hr;
TRACE("graph %p, source %p, flags %#x, context %p.\n", graph, source, flags, context);
TRACE("graph %p, source %p, flags %#lx, context %p.\n", graph, source, flags, context);
if (flags & ~AM_RENDEREX_RENDERTOEXISTINGRENDERERS)
FIXME("Unknown flags %#x.\n", flags);
FIXME("Unknown flags %#lx.\n", flags);
EnterCriticalSection(&graph->cs);
hr = autoplug(graph, source, NULL, !!(flags & AM_RENDEREX_RENDERTOEXISTINGRENDERERS), 0);
@ -1582,7 +1583,7 @@ static HRESULT WINAPI FilterGraph2_RenderEx(IFilterGraph2 *iface, IPin *source,
if (hr == VFW_E_CANNOT_CONNECT)
hr = VFW_E_CANNOT_RENDER;
TRACE("Returning %#x.\n", hr);
TRACE("Returning %#lx.\n", hr);
return hr;
}
@ -1646,7 +1647,7 @@ static HRESULT WINAPI MediaControl_GetTypeInfoCount(IMediaControl *iface, UINT *
static HRESULT WINAPI MediaControl_GetTypeInfo(IMediaControl *iface, UINT index,
LCID lcid, ITypeInfo **typeinfo)
{
TRACE("iface %p, index %u, lcid %#x, typeinfo %p.\n", iface, index, lcid, typeinfo);
TRACE("iface %p, index %u, lcid %#lx, typeinfo %p.\n", iface, index, lcid, typeinfo);
return strmbase_get_typeinfo(IMediaControl_tid, typeinfo);
}
@ -1656,7 +1657,7 @@ static HRESULT WINAPI MediaControl_GetIDsOfNames(IMediaControl *iface, REFIID ii
ITypeInfo *typeinfo;
HRESULT hr;
TRACE("iface %p, iid %s, names %p, count %u, lcid %#x, ids %p.\n",
TRACE("iface %p, iid %s, names %p, count %u, lcid %#lx, ids %p.\n",
iface, debugstr_guid(iid), names, count, lcid, ids);
if (SUCCEEDED(hr = strmbase_get_typeinfo(IMediaControl_tid, &typeinfo)))
@ -1673,7 +1674,7 @@ static HRESULT WINAPI MediaControl_Invoke(IMediaControl *iface, DISPID id, REFII
ITypeInfo *typeinfo;
HRESULT hr;
TRACE("iface %p, id %d, iid %s, lcid %#x, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n",
TRACE("iface %p, id %ld, iid %s, lcid %#lx, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n",
iface, id, debugstr_guid(iid), lcid, flags, params, result, excepinfo, error_arg);
if (SUCCEEDED(hr = strmbase_get_typeinfo(IMediaControl_tid, &typeinfo)))
@ -1741,11 +1742,11 @@ static HRESULT graph_start(struct filter_graph *graph, REFERENCE_TIME stream_sta
HRESULT filter_hr = IBaseFilter_Run(filter->filter, stream_start);
if (hr == S_OK)
hr = filter_hr;
TRACE("Filter %p returned %#x.\n", filter->filter, filter_hr);
TRACE("Filter %p returned %#lx.\n", filter->filter, filter_hr);
}
if (FAILED(hr))
WARN("Failed to start stream, hr %#x.\n", hr);
WARN("Failed to start stream, hr %#lx.\n", hr);
return hr;
}
@ -1840,7 +1841,7 @@ static HRESULT WINAPI MediaControl_Run(IMediaControl *iface)
HRESULT filter_hr = IBaseFilter_Pause(filter->filter);
if (hr == S_OK)
hr = filter_hr;
TRACE("Filter %p returned %#x.\n", filter->filter, filter_hr);
TRACE("Filter %p returned %#lx.\n", filter->filter, filter_hr);
/* If a filter returns VFW_S_CANT_CUE, we shouldn't wait for a
* paused state. */
@ -1852,7 +1853,7 @@ static HRESULT WINAPI MediaControl_Run(IMediaControl *iface)
if (FAILED(hr))
{
LeaveCriticalSection(&graph->cs);
WARN("Failed to pause, hr %#x.\n", hr);
WARN("Failed to pause, hr %#lx.\n", hr);
return hr;
}
}
@ -1900,7 +1901,7 @@ static HRESULT WINAPI MediaControl_GetState(IMediaControl *iface, LONG timeout,
{
struct filter_graph *graph = impl_from_IMediaControl(iface);
TRACE("graph %p, timeout %u, state %p.\n", graph, timeout, state);
TRACE("graph %p, timeout %ld, state %p.\n", graph, timeout, state);
if (timeout < 0) timeout = INFINITE;
@ -1951,13 +1952,13 @@ static void CALLBACK wait_pause_cb(TP_CALLBACK_INSTANCE *instance, void *context
HRESULT hr;
if ((hr = IMediaControl_GetState(control, INFINITE, &state)) != S_OK)
ERR("Failed to get paused state, hr %#x.\n", hr);
ERR("Failed to get paused state, hr %#lx.\n", hr);
if (FAILED(hr = IMediaControl_Stop(control)))
ERR("Failed to stop, hr %#x.\n", hr);
ERR("Failed to stop, hr %#lx.\n", hr);
if ((hr = IMediaControl_GetState(control, INFINITE, &state)) != S_OK)
ERR("Failed to get paused state, hr %#x.\n", hr);
ERR("Failed to get paused state, hr %#lx.\n", hr);
IMediaControl_Release(control);
}
@ -1969,7 +1970,7 @@ static void CALLBACK wait_stop_cb(TP_CALLBACK_INSTANCE *instance, void *context)
HRESULT hr;
if ((hr = IMediaControl_GetState(control, INFINITE, &state)) != S_OK)
ERR("Failed to get state, hr %#x.\n", hr);
ERR("Failed to get state, hr %#lx.\n", hr);
IMediaControl_Release(control);
}
@ -2056,9 +2057,6 @@ static HRESULT all_renderers_seek(struct filter_graph *This, fnFoundSeek FoundSe
HRESULT hr, hr_return = S_OK;
struct filter *filter;
TRACE("(%p)->(%p %08lx)\n", This, FoundSeek, arg);
/* Send a message to all renderers, they are responsible for broadcasting it further */
LIST_FOR_EACH_ENTRY(filter, &This->filters, struct filter, entry)
{
update_seeking(filter);
@ -2250,7 +2248,7 @@ static HRESULT WINAPI MediaSeeking_GetDuration(IMediaSeeking *iface, LONGLONG *d
LeaveCriticalSection(&graph->cs);
TRACE("Returning hr %#x, duration %s (%s seconds).\n", hr,
TRACE("Returning hr %#lx, duration %s (%s seconds).\n", hr,
wine_dbgstr_longlong(*duration), debugstr_time(*duration));
return hr;
}
@ -2358,7 +2356,7 @@ static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, LONGLONG *
struct filter *filter;
FILTER_STATE state;
TRACE("graph %p, current %s, current_flags %#x, stop %s, stop_flags %#x.\n", graph,
TRACE("graph %p, current %s, current_flags %#lx, stop %s, stop_flags %#lx.\n", graph,
current_ptr ? wine_dbgstr_longlong(*current_ptr) : "<null>", current_flags,
stop_ptr ? wine_dbgstr_longlong(*stop_ptr): "<null>", stop_flags);
if (current_ptr)
@ -2370,11 +2368,11 @@ static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, LONGLONG *
if ((current_flags & 0x7) != AM_SEEKING_AbsolutePositioning
&& (current_flags & 0x7) != AM_SEEKING_NoPositioning)
FIXME("Unhandled current_flags %#x.\n", current_flags & 0x7);
FIXME("Unhandled current_flags %#lx.\n", current_flags & 0x7);
if ((stop_flags & 0x7) != AM_SEEKING_NoPositioning
&& (stop_flags & 0x7) != AM_SEEKING_AbsolutePositioning)
FIXME("Unhandled stop_flags %#x.\n", stop_flags & 0x7);
FIXME("Unhandled stop_flags %#lx.\n", stop_flags & 0x7);
EnterCriticalSection(&graph->cs);
@ -2539,7 +2537,7 @@ static HRESULT WINAPI MediaPosition_GetTypeInfoCount(IMediaPosition *iface, UINT
static HRESULT WINAPI MediaPosition_GetTypeInfo(IMediaPosition *iface, UINT index,
LCID lcid, ITypeInfo **typeinfo)
{
TRACE("iface %p, index %u, lcid %#x, typeinfo %p.\n", iface, index, lcid, typeinfo);
TRACE("iface %p, index %u, lcid %#lx, typeinfo %p.\n", iface, index, lcid, typeinfo);
return strmbase_get_typeinfo(IMediaPosition_tid, typeinfo);
}
@ -2549,7 +2547,7 @@ static HRESULT WINAPI MediaPosition_GetIDsOfNames(IMediaPosition *iface, REFIID
ITypeInfo *typeinfo;
HRESULT hr;
TRACE("iface %p, iid %s, names %p, count %u, lcid %#x, ids %p.\n",
TRACE("iface %p, iid %s, names %p, count %u, lcid %#lx, ids %p.\n",
iface, debugstr_guid(iid), names, count, lcid, ids);
if (SUCCEEDED(hr = strmbase_get_typeinfo(IMediaPosition_tid, &typeinfo)))
@ -2566,7 +2564,7 @@ static HRESULT WINAPI MediaPosition_Invoke(IMediaPosition *iface, DISPID id, REF
ITypeInfo *typeinfo;
HRESULT hr;
TRACE("iface %p, id %d, iid %s, lcid %#x, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n",
TRACE("iface %p, id %ld, iid %s, lcid %#lx, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n",
iface, id, debugstr_guid(iid), lcid, flags, params, result, excepinfo, error_arg);
if (SUCCEEDED(hr = strmbase_get_typeinfo(IMediaPosition_tid, &typeinfo)))
@ -2868,7 +2866,7 @@ static HRESULT WINAPI BasicAudio_GetTypeInfoCount(IBasicAudio *iface, UINT *coun
static HRESULT WINAPI BasicAudio_GetTypeInfo(IBasicAudio *iface, UINT index,
LCID lcid, ITypeInfo **typeinfo)
{
TRACE("iface %p, index %u, lcid %#x, typeinfo %p.\n", iface, index, lcid, typeinfo);
TRACE("iface %p, index %u, lcid %#lx, typeinfo %p.\n", iface, index, lcid, typeinfo);
return strmbase_get_typeinfo(IBasicAudio_tid, typeinfo);
}
@ -2878,7 +2876,7 @@ static HRESULT WINAPI BasicAudio_GetIDsOfNames(IBasicAudio *iface, REFIID iid,
ITypeInfo *typeinfo;
HRESULT hr;
TRACE("iface %p, iid %s, names %p, count %u, lcid %#x, ids %p.\n",
TRACE("iface %p, iid %s, names %p, count %u, lcid %#lx, ids %p.\n",
iface, debugstr_guid(iid), names, count, lcid, ids);
if (SUCCEEDED(hr = strmbase_get_typeinfo(IBasicAudio_tid, &typeinfo)))
@ -2895,7 +2893,7 @@ static HRESULT WINAPI BasicAudio_Invoke(IBasicAudio *iface, DISPID id, REFIID ii
ITypeInfo *typeinfo;
HRESULT hr;
TRACE("iface %p, id %d, iid %s, lcid %#x, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n",
TRACE("iface %p, id %ld, iid %s, lcid %#lx, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n",
iface, id, debugstr_guid(iid), lcid, flags, params, result, excepinfo, error_arg);
if (SUCCEEDED(hr = strmbase_get_typeinfo(IBasicAudio_tid, &typeinfo)))
@ -2913,7 +2911,7 @@ static HRESULT WINAPI BasicAudio_put_Volume(IBasicAudio *iface, LONG lVolume)
IBasicAudio* pBasicAudio;
HRESULT hr;
TRACE("(%p/%p)->(%d)\n", This, iface, lVolume);
TRACE("graph %p, volume %ld.\n", This, lVolume);
EnterCriticalSection(&This->cs);
@ -2953,7 +2951,7 @@ static HRESULT WINAPI BasicAudio_put_Balance(IBasicAudio *iface, LONG lBalance)
IBasicAudio* pBasicAudio;
HRESULT hr;
TRACE("(%p/%p)->(%d)\n", This, iface, lBalance);
TRACE("graph %p, balance %ld.\n", This, lBalance);
EnterCriticalSection(&This->cs);
@ -3035,7 +3033,7 @@ static HRESULT WINAPI BasicVideo_GetTypeInfoCount(IBasicVideo2 *iface, UINT *cou
static HRESULT WINAPI BasicVideo_GetTypeInfo(IBasicVideo2 *iface, UINT index,
LCID lcid, ITypeInfo **typeinfo)
{
TRACE("iface %p, index %u, lcid %#x, typeinfo %p.\n", iface, index, lcid, typeinfo);
TRACE("iface %p, index %u, lcid %#lx, typeinfo %p.\n", iface, index, lcid, typeinfo);
return strmbase_get_typeinfo(IBasicVideo_tid, typeinfo);
}
@ -3045,7 +3043,7 @@ static HRESULT WINAPI BasicVideo_GetIDsOfNames(IBasicVideo2 *iface, REFIID iid,
ITypeInfo *typeinfo;
HRESULT hr;
TRACE("iface %p, iid %s, names %p, count %u, lcid %#x, ids %p.\n",
TRACE("iface %p, iid %s, names %p, count %u, lcid %#lx, ids %p.\n",
iface, debugstr_guid(iid), names, count, lcid, ids);
if (SUCCEEDED(hr = strmbase_get_typeinfo(IBasicVideo_tid, &typeinfo)))
@ -3062,7 +3060,7 @@ static HRESULT WINAPI BasicVideo_Invoke(IBasicVideo2 *iface, DISPID id, REFIID i
ITypeInfo *typeinfo;
HRESULT hr;
TRACE("iface %p, id %d, iid %s, lcid %#x, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n",
TRACE("iface %p, id %ld, iid %s, lcid %#lx, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n",
iface, id, debugstr_guid(iid), lcid, flags, params, result, excepinfo, error_arg);
if (SUCCEEDED(hr = strmbase_get_typeinfo(IBasicVideo_tid, &typeinfo)))
@ -3180,7 +3178,7 @@ static HRESULT WINAPI BasicVideo_put_SourceLeft(IBasicVideo2 *iface, LONG Source
IBasicVideo *pBasicVideo;
HRESULT hr;
TRACE("(%p/%p)->(%d)\n", This, iface, SourceLeft);
TRACE("graph %p, left %ld.\n", This, SourceLeft);
EnterCriticalSection(&This->cs);
@ -3220,7 +3218,7 @@ static HRESULT WINAPI BasicVideo_put_SourceWidth(IBasicVideo2 *iface, LONG Sourc
IBasicVideo *pBasicVideo;
HRESULT hr;
TRACE("(%p/%p)->(%d)\n", This, iface, SourceWidth);
TRACE("graph %p, width %ld.\n", This, SourceWidth);
EnterCriticalSection(&This->cs);
@ -3260,7 +3258,7 @@ static HRESULT WINAPI BasicVideo_put_SourceTop(IBasicVideo2 *iface, LONG SourceT
IBasicVideo *pBasicVideo;
HRESULT hr;
TRACE("(%p/%p)->(%d)\n", This, iface, SourceTop);
TRACE("graph %p, top %ld.\n", This, SourceTop);
EnterCriticalSection(&This->cs);
@ -3300,7 +3298,7 @@ static HRESULT WINAPI BasicVideo_put_SourceHeight(IBasicVideo2 *iface, LONG Sour
IBasicVideo *pBasicVideo;
HRESULT hr;
TRACE("(%p/%p)->(%d)\n", This, iface, SourceHeight);
TRACE("graph %p, height %ld.\n", This, SourceHeight);
EnterCriticalSection(&This->cs);
@ -3340,7 +3338,7 @@ static HRESULT WINAPI BasicVideo_put_DestinationLeft(IBasicVideo2 *iface, LONG D
IBasicVideo *pBasicVideo;
HRESULT hr;
TRACE("(%p/%p)->(%d)\n", This, iface, DestinationLeft);
TRACE("graph %p, left %ld.\n", This, DestinationLeft);
EnterCriticalSection(&This->cs);
@ -3380,7 +3378,7 @@ static HRESULT WINAPI BasicVideo_put_DestinationWidth(IBasicVideo2 *iface, LONG
IBasicVideo *pBasicVideo;
HRESULT hr;
TRACE("(%p/%p)->(%d)\n", This, iface, DestinationWidth);
TRACE("graph %p, width %ld.\n", This, DestinationWidth);
EnterCriticalSection(&This->cs);
@ -3420,7 +3418,7 @@ static HRESULT WINAPI BasicVideo_put_DestinationTop(IBasicVideo2 *iface, LONG De
IBasicVideo *pBasicVideo;
HRESULT hr;
TRACE("(%p/%p)->(%d)\n", This, iface, DestinationTop);
TRACE("graph %p, top %ld.\n", This, DestinationTop);
EnterCriticalSection(&This->cs);
@ -3460,7 +3458,7 @@ static HRESULT WINAPI BasicVideo_put_DestinationHeight(IBasicVideo2 *iface, LONG
IBasicVideo *pBasicVideo;
HRESULT hr;
TRACE("(%p/%p)->(%d)\n", This, iface, DestinationHeight);
TRACE("graph %p, height %ld.\n", This, DestinationHeight);
EnterCriticalSection(&This->cs);
@ -3502,7 +3500,7 @@ static HRESULT WINAPI BasicVideo_SetSourcePosition(IBasicVideo2 *iface, LONG Lef
IBasicVideo *pBasicVideo;
HRESULT hr;
TRACE("(%p/%p)->(%d, %d, %d, %d)\n", This, iface, Left, Top, Width, Height);
TRACE("graph %p, left %ld, top %ld, width %ld, height %ld.\n", This, Left, Top, Width, Height);
EnterCriticalSection(&This->cs);
@ -3564,7 +3562,7 @@ static HRESULT WINAPI BasicVideo_SetDestinationPosition(IBasicVideo2 *iface, LON
IBasicVideo *pBasicVideo;
HRESULT hr;
TRACE("(%p/%p)->(%d, %d, %d, %d)\n", This, iface, Left, Top, Width, Height);
TRACE("graph %p, left %ld, top %ld, width %ld, height %ld.\n", This, Left, Top, Width, Height);
EnterCriticalSection(&This->cs);
@ -3646,7 +3644,8 @@ static HRESULT WINAPI BasicVideo_GetVideoPaletteEntries(IBasicVideo2 *iface, LON
IBasicVideo *pBasicVideo;
HRESULT hr;
TRACE("(%p/%p)->(%d, %d, %p, %p)\n", This, iface, StartIndex, Entries, pRetrieved, pPalette);
TRACE("graph %p, start_index %ld, count %ld, ret_count %p, entries %p.\n",
This, StartIndex, Entries, pRetrieved, pPalette);
EnterCriticalSection(&This->cs);
@ -3819,7 +3818,7 @@ HRESULT WINAPI VideoWindow_GetTypeInfoCount(IVideoWindow *iface, UINT *count)
HRESULT WINAPI VideoWindow_GetTypeInfo(IVideoWindow *iface, UINT index,
LCID lcid, ITypeInfo **typeinfo)
{
TRACE("iface %p, index %u, lcid %#x, typeinfo %p.\n", iface, index, lcid, typeinfo);
TRACE("iface %p, index %u, lcid %#lx, typeinfo %p.\n", iface, index, lcid, typeinfo);
return strmbase_get_typeinfo(IVideoWindow_tid, typeinfo);
}
@ -3829,7 +3828,7 @@ HRESULT WINAPI VideoWindow_GetIDsOfNames(IVideoWindow *iface, REFIID iid,
ITypeInfo *typeinfo;
HRESULT hr;
TRACE("iface %p, iid %s, names %p, count %u, lcid %#x, ids %p.\n",
TRACE("iface %p, iid %s, names %p, count %u, lcid %#lx, ids %p.\n",
iface, debugstr_guid(iid), names, count, lcid, ids);
if (SUCCEEDED(hr = strmbase_get_typeinfo(IVideoWindow_tid, &typeinfo)))
@ -3846,7 +3845,7 @@ static HRESULT WINAPI VideoWindow_Invoke(IVideoWindow *iface, DISPID id, REFIID
ITypeInfo *typeinfo;
HRESULT hr;
TRACE("iface %p, id %d, iid %s, lcid %#x, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n",
TRACE("iface %p, id %ld, iid %s, lcid %#lx, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n",
iface, id, debugstr_guid(iid), lcid, flags, params, result, excepinfo, error_arg);
if (SUCCEEDED(hr = strmbase_get_typeinfo(IVideoWindow_tid, &typeinfo)))
@ -3904,7 +3903,7 @@ static HRESULT WINAPI VideoWindow_put_WindowStyle(IVideoWindow *iface, LONG Wind
IVideoWindow *pVideoWindow;
HRESULT hr;
TRACE("(%p/%p)->(%d)\n", This, iface, WindowStyle);
TRACE("graph %p, style %#lx.\n", This, WindowStyle);
EnterCriticalSection(&This->cs);
@ -3944,7 +3943,7 @@ static HRESULT WINAPI VideoWindow_put_WindowStyleEx(IVideoWindow *iface, LONG Wi
IVideoWindow *pVideoWindow;
HRESULT hr;
TRACE("(%p/%p)->(%d)\n", This, iface, WindowStyleEx);
TRACE("graph %p, style %#lx.\n", This, WindowStyleEx);
EnterCriticalSection(&This->cs);
@ -3984,7 +3983,7 @@ static HRESULT WINAPI VideoWindow_put_AutoShow(IVideoWindow *iface, LONG AutoSho
IVideoWindow *pVideoWindow;
HRESULT hr;
TRACE("(%p/%p)->(%d)\n", This, iface, AutoShow);
TRACE("graph %p, show %#lx.\n", This, AutoShow);
EnterCriticalSection(&This->cs);
@ -4024,7 +4023,7 @@ static HRESULT WINAPI VideoWindow_put_WindowState(IVideoWindow *iface, LONG Wind
IVideoWindow *pVideoWindow;
HRESULT hr;
TRACE("(%p/%p)->(%d)\n", This, iface, WindowState);
TRACE("graph %p, state %ld.\n", This, WindowState);
EnterCriticalSection(&This->cs);
@ -4064,7 +4063,7 @@ static HRESULT WINAPI VideoWindow_put_BackgroundPalette(IVideoWindow *iface, LON
IVideoWindow *pVideoWindow;
HRESULT hr;
TRACE("(%p/%p)->(%d)\n", This, iface, BackgroundPalette);
TRACE("graph %p, palette %ld.\n", This, BackgroundPalette);
EnterCriticalSection(&This->cs);
@ -4105,7 +4104,7 @@ static HRESULT WINAPI VideoWindow_put_Visible(IVideoWindow *iface, LONG Visible)
IVideoWindow *pVideoWindow;
HRESULT hr;
TRACE("(%p/%p)->(%d)\n", This, iface, Visible);
TRACE("graph %p, visible %ld.\n", This, Visible);
EnterCriticalSection(&This->cs);
@ -4145,7 +4144,7 @@ static HRESULT WINAPI VideoWindow_put_Left(IVideoWindow *iface, LONG Left)
IVideoWindow *pVideoWindow;
HRESULT hr;
TRACE("(%p/%p)->(%d)\n", This, iface, Left);
TRACE("graph %p, left %ld.\n", This, Left);
EnterCriticalSection(&This->cs);
@ -4185,7 +4184,7 @@ static HRESULT WINAPI VideoWindow_put_Width(IVideoWindow *iface, LONG Width)
IVideoWindow *pVideoWindow;
HRESULT hr;
TRACE("(%p/%p)->(%d)\n", This, iface, Width);
TRACE("graph %p, width %ld.\n", This, Width);
EnterCriticalSection(&This->cs);
@ -4225,7 +4224,7 @@ static HRESULT WINAPI VideoWindow_put_Top(IVideoWindow *iface, LONG Top)
IVideoWindow *pVideoWindow;
HRESULT hr;
TRACE("(%p/%p)->(%d)\n", This, iface, Top);
TRACE("graph %p, top %ld.\n", This, Top);
EnterCriticalSection(&This->cs);
@ -4265,7 +4264,7 @@ static HRESULT WINAPI VideoWindow_put_Height(IVideoWindow *iface, LONG Height)
IVideoWindow *pVideoWindow;
HRESULT hr;
TRACE("(%p/%p)->(%d)\n", This, iface, Height);
TRACE("graph %p, height %ld.\n", This, Height);
EnterCriticalSection(&This->cs);
@ -4305,7 +4304,7 @@ static HRESULT WINAPI VideoWindow_put_Owner(IVideoWindow *iface, OAHWND Owner)
IVideoWindow *pVideoWindow;
HRESULT hr;
TRACE("(%p/%p)->(%08x)\n", This, iface, (DWORD) Owner);
TRACE("graph %p, owner %#Ix.\n", This, Owner);
EnterCriticalSection(&This->cs);
@ -4345,7 +4344,7 @@ static HRESULT WINAPI VideoWindow_put_MessageDrain(IVideoWindow *iface, OAHWND D
IVideoWindow *pVideoWindow;
HRESULT hr;
TRACE("(%p/%p)->(%08x)\n", This, iface, (DWORD) Drain);
TRACE("graph %p, drain %#Ix.\n", This, Drain);
EnterCriticalSection(&This->cs);
@ -4405,7 +4404,7 @@ static HRESULT WINAPI VideoWindow_put_BorderColor(IVideoWindow *iface, LONG Colo
IVideoWindow *pVideoWindow;
HRESULT hr;
TRACE("(%p/%p)->(%d)\n", This, iface, Color);
TRACE("graph %p, colour %#lx.\n", This, Color);
EnterCriticalSection(&This->cs);
@ -4445,7 +4444,7 @@ static HRESULT WINAPI VideoWindow_put_FullScreenMode(IVideoWindow *iface, LONG F
IVideoWindow *pVideoWindow;
HRESULT hr;
TRACE("(%p/%p)->(%d)\n", This, iface, FullScreenMode);
TRACE("graph %p, fullscreen %ld.\n", This, FullScreenMode);
EnterCriticalSection(&This->cs);
@ -4465,7 +4464,7 @@ static HRESULT WINAPI VideoWindow_SetWindowForeground(IVideoWindow *iface, LONG
IVideoWindow *pVideoWindow;
HRESULT hr;
TRACE("(%p/%p)->(%d)\n", This, iface, Focus);
TRACE("graph %p, focus %ld.\n", This, Focus);
EnterCriticalSection(&This->cs);
@ -4486,7 +4485,7 @@ static HRESULT WINAPI VideoWindow_NotifyOwnerMessage(IVideoWindow *iface, OAHWND
IVideoWindow *pVideoWindow;
HRESULT hr;
TRACE("(%p/%p)->(%08lx, %d, %08lx, %08lx)\n", This, iface, hwnd, uMsg, wParam, lParam);
TRACE("graph %p, hwnd %#Ix, message %#lx, wparam %#Ix, lparam %#Ix.\n", This, hwnd, uMsg, wParam, lParam);
EnterCriticalSection(&This->cs);
@ -4507,7 +4506,7 @@ static HRESULT WINAPI VideoWindow_SetWindowPosition(IVideoWindow *iface, LONG Le
IVideoWindow *pVideoWindow;
HRESULT hr;
TRACE("(%p/%p)->(%d, %d, %d, %d)\n", This, iface, Left, Top, Width, Height);
TRACE("graph %p, left %ld, top %ld, width %ld, height %ld.\n", This, Left, Top, Width, Height);
EnterCriticalSection(&This->cs);
@ -4611,7 +4610,7 @@ static HRESULT WINAPI VideoWindow_HideCursor(IVideoWindow *iface, LONG HideCurso
IVideoWindow *pVideoWindow;
HRESULT hr;
TRACE("(%p/%p)->(%d)\n", This, iface, HideCursor);
TRACE("graph %p, hide %ld.\n", This, HideCursor);
EnterCriticalSection(&This->cs);
@ -4729,7 +4728,7 @@ static HRESULT WINAPI MediaEvent_GetTypeInfoCount(IMediaEventEx *iface, UINT *co
static HRESULT WINAPI MediaEvent_GetTypeInfo(IMediaEventEx *iface, UINT index,
LCID lcid, ITypeInfo **typeinfo)
{
TRACE("iface %p, index %u, lcid %#x, typeinfo %p.\n", iface, index, lcid, typeinfo);
TRACE("iface %p, index %u, lcid %#lx, typeinfo %p.\n", iface, index, lcid, typeinfo);
return strmbase_get_typeinfo(IMediaEvent_tid, typeinfo);
}
@ -4739,7 +4738,7 @@ static HRESULT WINAPI MediaEvent_GetIDsOfNames(IMediaEventEx *iface, REFIID iid,
ITypeInfo *typeinfo;
HRESULT hr;
TRACE("iface %p, iid %s, names %p, count %u, lcid %#x, ids %p.\n",
TRACE("iface %p, iid %s, names %p, count %u, lcid %#lx, ids %p.\n",
iface, debugstr_guid(iid), names, count, lcid, ids);
if (SUCCEEDED(hr = strmbase_get_typeinfo(IMediaEvent_tid, &typeinfo)))
@ -4756,7 +4755,7 @@ static HRESULT WINAPI MediaEvent_Invoke(IMediaEventEx *iface, DISPID id, REFIID
ITypeInfo *typeinfo;
HRESULT hr;
TRACE("iface %p, id %d, iid %s, lcid %#x, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n",
TRACE("iface %p, id %ld, iid %s, lcid %#lx, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n",
iface, id, debugstr_guid(iid), lcid, flags, params, result, excepinfo, error_arg);
if (SUCCEEDED(hr = strmbase_get_typeinfo(IMediaEvent_tid, &typeinfo)))
@ -4784,7 +4783,7 @@ static HRESULT WINAPI MediaEvent_GetEvent(IMediaEventEx *iface, LONG *code,
struct media_event *event;
struct list *entry;
TRACE("graph %p, code %p, param1 %p, param2 %p, timeout %d.\n", graph, code, param1, param2, timeout);
TRACE("graph %p, code %p, param1 %p, param2 %p, timeout %ld.\n", graph, code, param1, param2, timeout);
*code = 0;
@ -4815,7 +4814,7 @@ static HRESULT WINAPI MediaEvent_WaitForCompletion(IMediaEventEx *iface, LONG ms
{
struct filter_graph *This = impl_from_IMediaEventEx(iface);
TRACE("(%p/%p)->(%d, %p)\n", This, iface, msTimeout, pEvCode);
TRACE("graph %p, timeout %ld, code %p.\n", This, msTimeout, pEvCode);
if (This->state != State_Running)
return VFW_E_WRONG_STATE;
@ -4834,7 +4833,7 @@ static HRESULT WINAPI MediaEvent_CancelDefaultHandling(IMediaEventEx *iface, LON
{
struct filter_graph *This = impl_from_IMediaEventEx(iface);
TRACE("(%p/%p)->(%d)\n", This, iface, lEvCode);
TRACE("graph %p, code %#lx.\n", This, lEvCode);
if (lEvCode == EC_COMPLETE)
This->HandleEcComplete = FALSE;
@ -4852,7 +4851,7 @@ static HRESULT WINAPI MediaEvent_RestoreDefaultHandling(IMediaEventEx *iface, LO
{
struct filter_graph *This = impl_from_IMediaEventEx(iface);
TRACE("(%p/%p)->(%d)\n", This, iface, lEvCode);
TRACE("graph %p, code %#lx.\n", This, lEvCode);
if (lEvCode == EC_COMPLETE)
This->HandleEcComplete = TRUE;
@ -4866,12 +4865,12 @@ static HRESULT WINAPI MediaEvent_RestoreDefaultHandling(IMediaEventEx *iface, LO
return S_OK;
}
static HRESULT WINAPI MediaEvent_FreeEventParams(IMediaEventEx *iface, LONG lEvCode,
LONG_PTR lParam1, LONG_PTR lParam2)
static HRESULT WINAPI MediaEvent_FreeEventParams(IMediaEventEx *iface, LONG code,
LONG_PTR param1, LONG_PTR param2)
{
struct filter_graph *This = impl_from_IMediaEventEx(iface);
struct filter_graph *graph = impl_from_IMediaEventEx(iface);
TRACE("(%p/%p)->(%d, %08lx, %08lx): stub !!!\n", This, iface, lEvCode, lParam1, lParam2);
WARN("graph %p, code %#lx, param1 %Id, param2 %Id, stub!\n", graph, code, param1, param2);
return S_OK;
}
@ -4882,7 +4881,7 @@ static HRESULT WINAPI MediaEvent_SetNotifyWindow(IMediaEventEx *iface,
{
struct filter_graph *graph = impl_from_IMediaEventEx(iface);
TRACE("graph %p, window %#Ix, message %#x, lparam %#Ix.\n", graph, window, message, lparam);
TRACE("graph %p, window %#Ix, message %#lx, lparam %#Ix.\n", graph, window, message, lparam);
graph->media_event_window = (HWND)window;
graph->media_event_message = message;
@ -4895,11 +4894,11 @@ static HRESULT WINAPI MediaEvent_SetNotifyFlags(IMediaEventEx *iface, LONG flags
{
struct filter_graph *graph = impl_from_IMediaEventEx(iface);
TRACE("graph %p, flags %#x.\n", graph, flags);
TRACE("graph %p, flags %#lx.\n", graph, flags);
if (flags & ~AM_MEDIAEVENT_NONOTIFY)
{
WARN("Invalid flags %#x, returning E_INVALIDARG.\n", flags);
WARN("Invalid flags %#lx, returning E_INVALIDARG.\n", flags);
return E_INVALIDARG;
}
@ -5121,7 +5120,7 @@ static HRESULT WINAPI MediaFilter_GetState(IMediaFilter *iface, DWORD timeout, F
DWORD end = GetTickCount() + timeout;
HRESULT hr;
TRACE("graph %p, timeout %u, state %p.\n", graph, timeout, state);
TRACE("graph %p, timeout %lu, state %p.\n", graph, timeout, state);
if (!state)
return E_POINTER;
@ -5147,7 +5146,7 @@ static HRESULT WINAPI MediaFilter_GetState(IMediaFilter *iface, DWORD timeout, F
{
HRESULT filter_hr = IBaseFilter_GetState(filter->filter, 0, &filter_state);
TRACE("Filter %p returned hr %#x, state %u.\n", filter->filter, filter_hr, filter_state);
TRACE("Filter %p returned hr %#lx, state %u.\n", filter->filter, filter_hr, filter_state);
if (filter_hr == VFW_S_STATE_INTERMEDIATE)
async_filter = filter->filter;
@ -5189,7 +5188,7 @@ static HRESULT WINAPI MediaFilter_GetState(IMediaFilter *iface, DWORD timeout, F
EnterCriticalSection(&graph->cs);
}
TRACE("Returning %#x, state %u.\n", hr, *state);
TRACE("Returning %#lx, state %u.\n", hr, *state);
return hr;
}
@ -5308,7 +5307,7 @@ static HRESULT WINAPI MediaEventSink_Notify(IMediaEventSink *iface, LONG code,
{
struct filter_graph *graph = impl_from_IMediaEventSink(iface);
TRACE("graph %p, code %#x, param1 %#Ix, param2 %#Ix.\n", graph, code, param1, param2);
TRACE("graph %p, code %#lx, param1 %#Ix, param2 %#Ix.\n", graph, code, param1, param2);
EnterCriticalSection(&graph->event_cs);
@ -5372,34 +5371,35 @@ static ULONG WINAPI GraphConfig_Release(IGraphConfig *iface)
return IUnknown_Release(graph->outer_unk);
}
static HRESULT WINAPI GraphConfig_Reconnect(IGraphConfig *iface, IPin *pOutputPin, IPin *pInputPin,
const AM_MEDIA_TYPE *pmtFirstConnection, IBaseFilter *pUsingFilter, HANDLE hAbortEvent,
DWORD dwFlags)
static HRESULT WINAPI GraphConfig_Reconnect(IGraphConfig *iface, IPin *source, IPin *sink,
const AM_MEDIA_TYPE *mt, IBaseFilter *filter, HANDLE abort_event, DWORD flags)
{
struct filter_graph *This = impl_from_IGraphConfig(iface);
struct filter_graph *graph = impl_from_IGraphConfig(iface);
FIXME("graph %p, source %p, sink %p, mt %p, filter %p, abort_event %p, flags %#lx, stub!\n",
graph, source, sink, mt, filter, abort_event, flags);
strmbase_dump_media_type(mt);
FIXME("(%p)->(%p, %p, %p, %p, %p, %x): stub!\n", This, pOutputPin, pInputPin, pmtFirstConnection, pUsingFilter, hAbortEvent, dwFlags);
strmbase_dump_media_type(pmtFirstConnection);
return E_NOTIMPL;
}
static HRESULT WINAPI GraphConfig_Reconfigure(IGraphConfig *iface, IGraphConfigCallback *pCallback,
void *pvContext, DWORD dwFlags, HANDLE hAbortEvent)
static HRESULT WINAPI GraphConfig_Reconfigure(IGraphConfig *iface,
IGraphConfigCallback *callback, void *context, DWORD flags, HANDLE abort_event)
{
struct filter_graph *This = impl_from_IGraphConfig(iface);
struct filter_graph *graph = impl_from_IGraphConfig(iface);
HRESULT hr;
WARN("(%p)->(%p, %p, %x, %p): partial stub!\n", This, pCallback, pvContext, dwFlags, hAbortEvent);
TRACE("graph %p, callback %p, context %p, flags %#lx, abort_event %p.\n",
graph, callback, context, flags, abort_event);
if (hAbortEvent)
if (abort_event)
FIXME("The parameter hAbortEvent is not handled!\n");
EnterCriticalSection(&This->cs);
EnterCriticalSection(&graph->cs);
hr = IGraphConfigCallback_Reconfigure(pCallback, pvContext, dwFlags);
hr = IGraphConfigCallback_Reconfigure(callback, context, flags);
LeaveCriticalSection(&This->cs);
LeaveCriticalSection(&graph->cs);
return hr;
}
@ -5450,12 +5450,11 @@ static HRESULT WINAPI GraphConfig_PushThroughData(IGraphConfig *iface, IPin *pOu
return E_NOTIMPL;
}
static HRESULT WINAPI GraphConfig_SetFilterFlags(IGraphConfig *iface, IBaseFilter *pFilter,
DWORD dwFlags)
static HRESULT WINAPI GraphConfig_SetFilterFlags(IGraphConfig *iface, IBaseFilter *filter, DWORD flags)
{
struct filter_graph *This = impl_from_IGraphConfig(iface);
struct filter_graph *graph = impl_from_IGraphConfig(iface);
FIXME("(%p)->(%p, %x): stub!\n", This, pFilter, dwFlags);
FIXME("graph %p, filter %p, flags %#lx, stub!\n", graph, filter, flags);
return E_NOTIMPL;
}
@ -5470,12 +5469,11 @@ static HRESULT WINAPI GraphConfig_GetFilterFlags(IGraphConfig *iface, IBaseFilte
return E_NOTIMPL;
}
static HRESULT WINAPI GraphConfig_RemoveFilterEx(IGraphConfig *iface, IBaseFilter *pFilter,
DWORD dwFlags)
static HRESULT WINAPI GraphConfig_RemoveFilterEx(IGraphConfig *iface, IBaseFilter *filter, DWORD flags)
{
struct filter_graph *This = impl_from_IGraphConfig(iface);
struct filter_graph *graph = impl_from_IGraphConfig(iface);
FIXME("(%p)->(%p, %x): stub!\n", This, pFilter, dwFlags);
FIXME("graph %p, filter %p, flags %#lx, stub!\n", graph, filter, flags);
return E_NOTIMPL;
}
@ -5523,16 +5521,16 @@ static ULONG WINAPI GraphVersion_Release(IGraphVersion *iface)
return IUnknown_Release(graph->outer_unk);
}
static HRESULT WINAPI GraphVersion_QueryVersion(IGraphVersion *iface, LONG *pVersion)
static HRESULT WINAPI GraphVersion_QueryVersion(IGraphVersion *iface, LONG *version)
{
struct filter_graph *This = impl_from_IGraphVersion(iface);
struct filter_graph *graph = impl_from_IGraphVersion(iface);
if(!pVersion)
TRACE("graph %p, version %p, returning %ld.\n", graph, version, graph->version);
if (!version)
return E_POINTER;
TRACE("(%p)->(%p): current version %i\n", This, pVersion, This->version);
*pVersion = This->version;
*version = graph->version;
return S_OK;
}
@ -5569,13 +5567,13 @@ static ULONG WINAPI VideoFrameStep_Release(IVideoFrameStep *iface)
static HRESULT WINAPI VideoFrameStep_Step(IVideoFrameStep *iface, DWORD frame_count, IUnknown *filter)
{
FIXME("iface %p, frame_count %u, filter %p, stub!\n", iface, frame_count, filter);
FIXME("iface %p, frame_count %lu, filter %p, stub!\n", iface, frame_count, filter);
return E_NOTIMPL;
}
static HRESULT WINAPI VideoFrameStep_CanStep(IVideoFrameStep *iface, LONG multiple, IUnknown *filter)
{
FIXME("iface %p, multiple %d, filter %p, stub!\n", iface, multiple, filter);
FIXME("iface %p, multiple %ld, filter %p, stub!\n", iface, multiple, filter);
return E_NOTIMPL;
}
@ -5633,7 +5631,7 @@ static HRESULT filter_graph_common_create(IUnknown *outer, IUnknown **out, BOOL
if (FAILED(hr = CoCreateInstance(&CLSID_FilterMapper2, object->outer_unk,
CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&object->punkFilterMapper2)))
{
ERR("Failed to create filter mapper, hr %#x.\n", hr);
ERR("Failed to create filter mapper, hr %#lx.\n", hr);
free(object);
return hr;
}

96
dlls/quartz/filtermapper.c
View file

@ -76,7 +76,7 @@ static ULONG WINAPI enum_reg_filters_AddRef(IEnumRegFilters *iface)
{
struct enum_reg_filters *enumerator = impl_from_IEnumRegFilters(iface);
ULONG refcount = InterlockedIncrement(&enumerator->refcount);
TRACE("%p increasing refcount to %u.\n", enumerator, refcount);
TRACE("%p increasing refcount to %lu.\n", enumerator, refcount);
return refcount;
}
@ -86,7 +86,7 @@ static ULONG WINAPI enum_reg_filters_Release(IEnumRegFilters *iface)
ULONG refcount = InterlockedDecrement(&enumerator->refcount);
unsigned int i;
TRACE("%p decreasing refcount to %u.\n", enumerator, refcount);
TRACE("%p decreasing refcount to %lu.\n", enumerator, refcount);
if (!refcount)
{
for (i = 0; i < enumerator->count; ++i)
@ -103,7 +103,7 @@ static HRESULT WINAPI enum_reg_filters_Next(IEnumRegFilters *iface, ULONG count,
struct enum_reg_filters *enumerator = impl_from_IEnumRegFilters(iface);
unsigned int i;
TRACE("iface %p, count %u, filters %p, ret_count %p.\n", iface, count, filters, ret_count);
TRACE("iface %p, count %lu, filters %p, ret_count %p.\n", iface, count, filters, ret_count);
for (i = 0; i < count && enumerator->index + i < enumerator->count; ++i)
{
@ -131,7 +131,7 @@ static HRESULT WINAPI enum_reg_filters_Next(IEnumRegFilters *iface, ULONG count,
static HRESULT WINAPI enum_reg_filters_Skip(IEnumRegFilters *iface, ULONG count)
{
TRACE("iface %p, count %u, unimplemented.\n", iface, count);
TRACE("iface %p, count %lu, unimplemented.\n", iface, count);
return E_NOTIMPL;
}
@ -234,7 +234,7 @@ static ULONG WINAPI enum_moniker_AddRef(IEnumMoniker *iface)
{
struct enum_moniker *enumerator = impl_from_IEnumMoniker(iface);
ULONG refcount = InterlockedIncrement(&enumerator->refcount);
TRACE("%p increasing refcount to %u.\n", enumerator, refcount);
TRACE("%p increasing refcount to %lu.\n", enumerator, refcount);
return refcount;
}
@ -244,7 +244,7 @@ static ULONG WINAPI enum_moniker_Release(IEnumMoniker *iface)
ULONG refcount = InterlockedDecrement(&enumerator->refcount);
unsigned int i;
TRACE("%p decreasing refcount to %u.\n", enumerator, refcount);
TRACE("%p decreasing refcount to %lu.\n", enumerator, refcount);
if (!refcount)
{
for (i = 0; i < enumerator->count; ++i)
@ -261,7 +261,7 @@ static HRESULT WINAPI enum_moniker_Next(IEnumMoniker *iface, ULONG count,
struct enum_moniker *enumerator = impl_from_IEnumMoniker(iface);
unsigned int i;
TRACE("iface %p, count %u, filters %p, ret_count %p.\n", iface, count, filters, ret_count);
TRACE("iface %p, count %lu, filters %p, ret_count %p.\n", iface, count, filters, ret_count);
for (i = 0; i < count && enumerator->index + i < enumerator->count; ++i)
IMoniker_AddRef(filters[i] = enumerator->filters[enumerator->index + i]);
@ -276,7 +276,7 @@ static HRESULT WINAPI enum_moniker_Skip(IEnumMoniker *iface, ULONG count)
{
struct enum_moniker *enumerator = impl_from_IEnumMoniker(iface);
TRACE("iface %p, count %u.\n", iface, count);
TRACE("iface %p, count %lu.\n", iface, count);
enumerator->index += count;
return S_OK;
@ -469,27 +469,27 @@ static HRESULT WINAPI Inner_QueryInterface(IUnknown *iface, REFIID riid, void **
static ULONG WINAPI Inner_AddRef(IUnknown *iface)
{
FilterMapper3Impl *This = impl_from_IUnknown(iface);
ULONG ref = InterlockedIncrement(&This->ref);
FilterMapper3Impl *mapper = impl_from_IUnknown(iface);
ULONG refcount = InterlockedIncrement(&mapper->ref);
TRACE("(%p)->(): new ref = %d\n", This, ref);
TRACE("%p increasing refcount to %lu.\n", mapper, refcount);
return ref;
return refcount;
}
static ULONG WINAPI Inner_Release(IUnknown *iface)
{
FilterMapper3Impl *This = impl_from_IUnknown(iface);
ULONG ref = InterlockedDecrement(&This->ref);
FilterMapper3Impl *mapper = impl_from_IUnknown(iface);
ULONG refcount = InterlockedDecrement(&mapper->ref);
TRACE("(%p)->(): new ref = %d\n", This, ref);
TRACE("%p decreasing refcount to %lu.\n", mapper, refcount);
if (ref == 0)
if (!refcount)
{
CoTaskMemFree(This);
CoTaskMemFree(mapper);
}
return ref;
return refcount;
}
static const IUnknownVtbl IInner_VTable =
@ -529,7 +529,7 @@ static HRESULT WINAPI FilterMapper3_CreateCategory(IFilterMapper3 *iface,
HKEY key;
LONG ret;
TRACE("iface %p, category %s, merit %#x, description %s.\n", iface,
TRACE("iface %p, category %s, merit %#lx, description %s.\n", iface,
debugstr_guid(category), merit, debugstr_w(description));
StringFromGUID2(category, guidstr, ARRAY_SIZE(guidstr));
@ -702,14 +702,14 @@ static HRESULT FM2_ReadFilterData(BYTE *pData, REGFILTER2 * prf2)
if (prrf->dwVersion != 2)
{
FIXME("Filter registry version %d not supported\n", prrf->dwVersion);
FIXME("Filter registry version %lu is not supported.\n", prrf->dwVersion);
ZeroMemory(prf2, sizeof(*prf2));
hr = E_FAIL;
}
if (SUCCEEDED(hr))
{
TRACE("version = %d, merit = %x, #pins = %d, unused = %x\n",
TRACE("dwVersion %lu, dwMerit %#lx, dwPins %lu, dwUnused %#lx.\n",
prrf->dwVersion, prrf->dwMerit, prrf->dwPins, prrf->dwUnused);
prf2->dwVersion = prrf->dwVersion;
@ -730,7 +730,7 @@ static HRESULT FM2_ReadFilterData(BYTE *pData, REGFILTER2 * prf2)
TRACE("\tsignature = %s\n", debugstr_an((const char*)prrfp->signature, 4));
TRACE("\tpin[%d]: flags = %x, instances = %d, media types = %d, mediums = %d\n",
TRACE("\tPin %lu: dwFlags %#lx, dwInstances %lu, dwMediaTypes %lu, dwMediums %lu.\n",
i, prrfp->dwFlags, prrfp->dwInstances, prrfp->dwMediaTypes, prrfp->dwMediums);
rgPins2[i].dwFlags = prrfp->dwFlags;
@ -901,7 +901,7 @@ static HRESULT WINAPI FilterMapper3_RegisterFilter(IFilterMapper3 *iface,
if (FAILED(hr = IParseDisplayName_ParseDisplayName(parser, NULL, display_name, &eaten, &moniker)))
{
ERR("Failed to parse display name, hr %#x.\n", hr);
ERR("Failed to parse display name, hr %#lx.\n", hr);
IParseDisplayName_Release(parser);
free(display_name);
return hr;
@ -911,7 +911,7 @@ static HRESULT WINAPI FilterMapper3_RegisterFilter(IFilterMapper3 *iface,
if (FAILED(hr = IMoniker_BindToStorage(moniker, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag)))
{
ERR("Failed to get property bag, hr %#x.\n", hr);
ERR("Failed to get property bag, hr %#lx.\n", hr);
IMoniker_Release(moniker);
free(display_name);
return hr;
@ -920,13 +920,13 @@ static HRESULT WINAPI FilterMapper3_RegisterFilter(IFilterMapper3 *iface,
V_VT(&var) = VT_BSTR;
V_BSTR(&var) = SysAllocString(name);
if (FAILED(hr = IPropertyBag_Write(prop_bag, L"FriendlyName", &var)))
ERR("Failed to write friendly name, hr %#x.\n", hr);
ERR("Failed to write friendly name, hr %#lx.\n", hr);
VariantClear(&var);
V_VT(&var) = VT_BSTR;
V_BSTR(&var) = SysAllocString(clsid_string);
if (FAILED(hr = IPropertyBag_Write(prop_bag, L"CLSID", &var)))
ERR("Failed to write class ID, hr %#x.\n", hr);
ERR("Failed to write class ID, hr %#lx.\n", hr);
VariantClear(&var);
if (SUCCEEDED(FM2_WriteFilterData(&regfilter2, &filter_data, &filter_data_len)))
@ -936,7 +936,7 @@ static HRESULT WINAPI FilterMapper3_RegisterFilter(IFilterMapper3 *iface,
{
memcpy(V_ARRAY(&var)->pvData, filter_data, filter_data_len);
if (FAILED(hr = IPropertyBag_Write(prop_bag, L"FilterData", &var)))
ERR("Failed to write filter data, hr %#x.\n", hr);
ERR("Failed to write filter data, hr %#lx.\n", hr);
VariantClear(&var);
}
@ -1030,7 +1030,7 @@ static HRESULT WINAPI FilterMapper3_EnumMatchingFilters(
HRESULT hr;
struct Vector monikers = {NULL, 0, 0};
TRACE("(%p, %x, %s, %x, %s, %d, %p, %p, %p, %s, %s, %p, %p, %p)\n",
TRACE("(%p, %#lx, %s, %#lx, %s, %lu, %p, %p, %p, %s, %s, %p, %p, %p)\n",
ppEnum,
dwFlags,
bExactMatch ? "true" : "false",
@ -1047,9 +1047,7 @@ static HRESULT WINAPI FilterMapper3_EnumMatchingFilters(
pPinCategoryOut);
if (dwFlags != 0)
{
FIXME("dwFlags = %x not implemented\n", dwFlags);
}
FIXME("Ignoring flags %#lx.\n", dwFlags);
*ppEnum = NULL;
@ -1289,7 +1287,7 @@ static HRESULT WINAPI FilterMapper_EnumMatchingFilters(
REGFILTER* regfilters;
HRESULT hr;
TRACE("(%p/%p)->(%p, %x, %s, %s, %s, %s, %s, %s, %s)\n",
TRACE("(%p/%p)->(%p, %#lx, %s, %s, %s, %s, %s, %s, %s)\n",
This,
iface,
ppEnum,
@ -1401,7 +1399,7 @@ static HRESULT WINAPI FilterMapper_RegisterFilter(IFilterMapper * iface,
HKEY key;
LONG ret;
TRACE("iface %p, clsid %s, name %s, merit %#x.\n",
TRACE("iface %p, clsid %s, name %s, merit %#lx.\n",
iface, debugstr_guid(&clsid), debugstr_w(name), merit);
StringFromGUID2(&clsid, guidstr, ARRAY_SIZE(guidstr));
@ -1412,7 +1410,7 @@ static HRESULT WINAPI FilterMapper_RegisterFilter(IFilterMapper * iface,
return HRESULT_FROM_WIN32(ret);
if ((ret = RegSetValueExW(key, NULL, 0, REG_SZ, (const BYTE *)name, (wcslen(name) + 1) * sizeof(WCHAR))))
ERR("Failed to set filter name, error %u.\n", ret);
ERR("Failed to set filter name, error %lu.\n", ret);
RegCloseKey(key);
wcscpy(keypath, L"CLSID\\");
@ -1420,11 +1418,11 @@ static HRESULT WINAPI FilterMapper_RegisterFilter(IFilterMapper * iface,
if (!(ret = RegCreateKeyExW(HKEY_CLASSES_ROOT, keypath, 0, NULL, 0, KEY_WRITE, NULL, &key, NULL)))
{
if ((ret = RegSetValueExW(key, L"Merit", 0, REG_DWORD, (const BYTE *)&merit, sizeof(DWORD))))
ERR("Failed to set merit, error %u.\n", ret);
ERR("Failed to set merit, error %lu.\n", ret);
RegCloseKey(key);
}
else
ERR("Failed to create CLSID key, error %u.\n", ret);
ERR("Failed to create CLSID key, error %lu.\n", ret);
return S_OK;
}
@ -1466,7 +1464,7 @@ static HRESULT WINAPI FilterMapper_RegisterPin(IFilterMapper *iface, CLSID clsid
if ((ret = RegCreateKeyExW(key, pin_keypath, 0, NULL, 0, KEY_WRITE, NULL, &pin_key, NULL)))
{
ERR("Failed to open pin key, error %u.\n", ret);
ERR("Failed to open pin key, error %lu.\n", ret);
free(pin_keypath);
RegCloseKey(key);
return HRESULT_FROM_WIN32(ret);
@ -1474,18 +1472,18 @@ static HRESULT WINAPI FilterMapper_RegisterPin(IFilterMapper *iface, CLSID clsid
free(pin_keypath);
if ((ret = RegSetValueExW(pin_key, L"AllowedMany", 0, REG_DWORD, (const BYTE *)&many, sizeof(DWORD))))
ERR("Failed to set AllowedMany value, error %u.\n", ret);
ERR("Failed to set AllowedMany value, error %lu.\n", ret);
if ((ret = RegSetValueExW(pin_key, L"AllowedZero", 0, REG_DWORD, (const BYTE *)&zero, sizeof(DWORD))))
ERR("Failed to set AllowedZero value, error %u.\n", ret);
ERR("Failed to set AllowedZero value, error %lu.\n", ret);
if ((ret = RegSetValueExW(pin_key, L"Direction", 0, REG_DWORD, (const BYTE *)&output, sizeof(DWORD))))
ERR("Failed to set Direction value, error %u.\n", ret);
ERR("Failed to set Direction value, error %lu.\n", ret);
if ((ret = RegSetValueExW(pin_key, L"IsRendered", 0, REG_DWORD, (const BYTE *)&rendered, sizeof(DWORD))))
ERR("Failed to set IsRendered value, error %u.\n", ret);
ERR("Failed to set IsRendered value, error %lu.\n", ret);
if (!(ret = RegCreateKeyExW(pin_key, L"Types", 0, NULL, 0, 0, NULL, &type_key, NULL)))
RegCloseKey(type_key);
else
ERR("Failed to create Types subkey, error %u.\n", ret);
ERR("Failed to create Types subkey, error %lu.\n", ret);
RegCloseKey(pin_key);
RegCloseKey(key);
@ -1527,7 +1525,7 @@ static HRESULT WINAPI FilterMapper_RegisterPinType(IFilterMapper *iface,
if (!(ret = RegCreateKeyExW(key, type_keypath, 0, NULL, 0, 0, NULL, &type_key, NULL)))
RegCloseKey(type_key);
else
ERR("Failed to create type key, error %u.\n", ret);
ERR("Failed to create type key, error %lu.\n", ret);
RegCloseKey(key);
return HRESULT_FROM_WIN32(ret);
@ -1546,7 +1544,7 @@ static HRESULT WINAPI FilterMapper_UnregisterFilter(IFilterMapper *iface, CLSID
if ((ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, L"Filter", 0, 0, &key)))
return HRESULT_FROM_WIN32(ret);
if ((ret = RegDeleteKeyW(key, guidstr)))
ERR("Failed to delete filter key, error %u.\n", ret);
ERR("Failed to delete filter key, error %lu.\n", ret);
RegCloseKey(key);
wcscpy(keypath, L"CLSID\\");
@ -1554,13 +1552,13 @@ static HRESULT WINAPI FilterMapper_UnregisterFilter(IFilterMapper *iface, CLSID
if (!(ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, keypath, 0, KEY_WRITE, &key)))
{
if ((ret = RegDeleteValueW(key, L"Merit")))
ERR("Failed to delete Merit value, error %u.\n", ret);
ERR("Failed to delete Merit value, error %lu.\n", ret);
if ((ret = RegDeleteTreeW(key, L"Pins")))
ERR("Failed to delete Pins key, error %u.\n", ret);
ERR("Failed to delete Pins key, error %lu.\n", ret);
RegCloseKey(key);
}
else
ERR("Failed to open CLSID key, error %u.\n", ret);
ERR("Failed to open CLSID key, error %lu.\n", ret);
return S_OK;
}
@ -1592,7 +1590,7 @@ static HRESULT WINAPI FilterMapper_UnregisterPin(IFilterMapper * iface, CLSID cl
return HRESULT_FROM_WIN32(ret);
if ((ret = RegDeleteTreeW(key, name)))
ERR("Failed to delete subkey, error %u.\n", ret);
ERR("Failed to delete subkey, error %lu.\n", ret);
RegCloseKey(key);
@ -1648,7 +1646,7 @@ static HRESULT WINAPI AMFilterData_ParseFilterData(IAMFilterData* iface,
HRESULT hr = S_OK;
static REGFILTER2 *prf2;
TRACE("(%p/%p)->(%p, %d, %p)\n", This, iface, pData, cb, ppRegFilter2);
TRACE("mapper %p, data %p, size %lu, parsed_data %p.\n", This, pData, cb, ppRegFilter2);
prf2 = CoTaskMemAlloc(sizeof(*prf2));
if (!prf2)

9
dlls/quartz/main.c
View file

@ -260,13 +260,13 @@ const char * qzdebugstr_guid( const GUID * id )
return debugstr_guid(id);
}
LONG WINAPI AmpFactorToDB(LONG ampfactor)
int WINAPI AmpFactorToDB(int ampfactor)
{
FIXME("(%d) Stub!\n", ampfactor);
return 0;
}
LONG WINAPI DBToAmpFactor(LONG db)
int WINAPI DBToAmpFactor(int db)
{
FIXME("(%d) Stub!\n", db);
/* Avoid divide by zero (probably during range computation) in Windows Media Player 6.4 */
@ -283,7 +283,8 @@ DWORD WINAPI AMGetErrorTextA(HRESULT hr, LPSTR buffer, DWORD maxlen)
DWORD res;
WCHAR errorW[MAX_ERROR_TEXT_LEN];
TRACE("(%x,%p,%d)\n", hr, buffer, maxlen);
TRACE("hr %#lx, buffer %p, maxlen %lu.\n", hr, buffer, maxlen);
if (!buffer)
return 0;
@ -305,7 +306,7 @@ DWORD WINAPI AMGetErrorTextW(HRESULT hr, LPWSTR buffer, DWORD maxlen)
unsigned int len;
WCHAR error[MAX_ERROR_TEXT_LEN];
FIXME("(%x,%p,%d) stub\n", hr, buffer, maxlen);
TRACE("hr %#lx, buffer %p, maxlen %lu.\n", hr, buffer, maxlen);
if (!buffer) return 0;
swprintf(error, ARRAY_SIZE(error), L"Error: 0x%lx", hr);

44
dlls/quartz/memallocator.c
View file

@ -135,7 +135,7 @@ static ULONG WINAPI BaseMemAllocator_AddRef(IMemAllocator * iface)
BaseMemAllocator *This = impl_from_IMemAllocator(iface);
ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p)->() AddRef from %d\n", iface, ref - 1);
TRACE("%p increasing refcount to %lu.\n", This, ref);
return ref;
}
@ -145,7 +145,7 @@ static ULONG WINAPI BaseMemAllocator_Release(IMemAllocator * iface)
BaseMemAllocator *This = impl_from_IMemAllocator(iface);
ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p)->() Release from %d\n", iface, ref + 1);
TRACE("%p decreasing refcount to %lu.\n", This, ref);
if (!ref)
{
@ -166,7 +166,7 @@ static HRESULT WINAPI BaseMemAllocator_SetProperties(IMemAllocator * iface, ALLO
TRACE("(%p)->(%p, %p)\n", This, pRequest, pActual);
TRACE("Requested %d buffers, size %d, alignment %d, prefix %d.\n",
TRACE("Requested %ld buffers, size %ld, alignment %ld, prefix %ld.\n",
pRequest->cBuffers, pRequest->cbBuffer, pRequest->cbAlign, pRequest->cbPrefix);
EnterCriticalSection(This->pCritSect);
@ -236,7 +236,7 @@ static HRESULT WINAPI BaseMemAllocator_Commit(IMemAllocator * iface)
{
if (!(This->hSemWaiting = CreateSemaphoreW(NULL, This->props.cBuffers, This->props.cBuffers, NULL)))
{
ERR("Couldn't create semaphore (error was %u)\n", GetLastError());
ERR("Failed to create semaphore, error %lu.\n", GetLastError());
hr = HRESULT_FROM_WIN32(GetLastError());
}
else
@ -245,7 +245,7 @@ static HRESULT WINAPI BaseMemAllocator_Commit(IMemAllocator * iface)
if (SUCCEEDED(hr))
This->bCommitted = TRUE;
else
ERR("fnAlloc failed with error 0x%x\n", hr);
ERR("Failed to allocate, hr %#lx.\n", hr);
}
}
}
@ -278,15 +278,13 @@ static HRESULT WINAPI BaseMemAllocator_Decommit(IMemAllocator * iface)
else
{
if (This->lWaiting != 0)
ERR("Waiting: %d\n", This->lWaiting);
ERR("Waiting: %ld\n", This->lWaiting);
This->bCommitted = FALSE;
CloseHandle(This->hSemWaiting);
This->hSemWaiting = NULL;
hr = This->fnFree(iface);
if (FAILED(hr))
ERR("fnFree failed with error 0x%x\n", hr);
}
}
}
@ -302,8 +300,9 @@ static HRESULT WINAPI BaseMemAllocator_GetBuffer(IMemAllocator * iface, IMediaSa
/* NOTE: The pStartTime and pEndTime parameters are not applied to the sample.
* The allocator might use these values to determine which buffer it retrieves */
TRACE("(%p)->(%p, %p, %p, %x)\n", This, pSample, pStartTime, pEndTime, dwFlags);
TRACE("allocator %p, sample %p, start_time %p, end_time %p, flags %#lx.\n",
This, pSample, pStartTime, pEndTime, dwFlags);
*pSample = NULL;
@ -351,7 +350,7 @@ static HRESULT WINAPI BaseMemAllocator_GetBuffer(IMemAllocator * iface, IMediaSa
LeaveCriticalSection(This->pCritSect);
if (hr != S_OK)
WARN("%08x\n", hr);
WARN("Returning hr %#lx.\n", hr);
return hr;
}
@ -379,10 +378,8 @@ static HRESULT WINAPI BaseMemAllocator_ReleaseBuffer(IMemAllocator * iface, IMed
if (list_empty(&This->used_list) && This->bDecommitQueued && This->bCommitted)
{
HRESULT hrfree;
if (This->lWaiting != 0)
ERR("Waiting: %d\n", This->lWaiting);
ERR("Waiting: %ld\n", This->lWaiting);
This->bCommitted = FALSE;
This->bDecommitQueued = FALSE;
@ -390,8 +387,7 @@ static HRESULT WINAPI BaseMemAllocator_ReleaseBuffer(IMemAllocator * iface, IMed
CloseHandle(This->hSemWaiting);
This->hSemWaiting = NULL;
if (FAILED(hrfree = This->fnFree(iface)))
ERR("fnFree failed with error 0x%x\n", hrfree);
This->fnFree(iface);
}
}
LeaveCriticalSection(This->pCritSect);
@ -399,7 +395,7 @@ static HRESULT WINAPI BaseMemAllocator_ReleaseBuffer(IMemAllocator * iface, IMed
/* notify a waiting thread that there is now a free buffer */
if (This->hSemWaiting && !ReleaseSemaphore(This->hSemWaiting, 1, NULL))
{
ERR("ReleaseSemaphore failed with error %u\n", GetLastError());
ERR("Failed to release semaphore, error %lu.\n", GetLastError());
hr = HRESULT_FROM_WIN32(GetLastError());
}
@ -479,7 +475,7 @@ static ULONG WINAPI StdMediaSample2_AddRef(IMediaSample2 * iface)
StdMediaSample2 *This = impl_from_IMediaSample2(iface);
ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p)->(): new ref = %d\n", This, ref);
TRACE("%p increasing refcount to %lu.\n", This, ref);
return ref;
}
@ -489,7 +485,7 @@ static ULONG WINAPI StdMediaSample2_Release(IMediaSample2 * iface)
StdMediaSample2 *This = impl_from_IMediaSample2(iface);
ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p)->(): new ref = %d\n", This, ref);
TRACE("%p decreasing refcount to %lu.\n", This, ref);
if (!ref)
{
@ -645,11 +641,11 @@ static HRESULT WINAPI StdMediaSample2_SetActualDataLength(IMediaSample2 * iface,
{
StdMediaSample2 *This = impl_from_IMediaSample2(iface);
TRACE("(%p)->(%d)\n", iface, len);
TRACE("sample %p, len %ld.\n", This, len);
if ((len > This->props.cbBuffer) || (len < 0))
{
WARN("Tried to set length to %d, while max is %d\n", len, This->props.cbBuffer);
ERR("Length %ld exceeds maximum %ld.\n", len, This->props.cbBuffer);
return VFW_E_BUFFER_OVERFLOW;
}
else
@ -766,7 +762,7 @@ static HRESULT WINAPI StdMediaSample2_GetProperties(IMediaSample2 * iface, DWORD
{
StdMediaSample2 *This = impl_from_IMediaSample2(iface);
TRACE("(%p)->(%d, %p)\n", iface, cbProperties, pbProperties);
TRACE("sample %p, size %lu, properties %p.\n", This, cbProperties, pbProperties);
memcpy(pbProperties, &This->props, min(cbProperties, sizeof(This->props)));
@ -777,7 +773,7 @@ static HRESULT WINAPI StdMediaSample2_SetProperties(IMediaSample2 * iface, DWORD
{
StdMediaSample2 *This = impl_from_IMediaSample2(iface);
TRACE("(%p)->(%d, %p)\n", iface, cbProperties, pbProperties);
TRACE("sample %p, size %lu, properties %p.\n", This, cbProperties, pbProperties);
/* NOTE: pbBuffer and cbBuffer are read-only */
memcpy(&This->props, pbProperties, min(cbProperties, AM_SAMPLE2_PROP_SIZE_WRITABLE));
@ -896,7 +892,7 @@ static HRESULT StdMemAllocator_Free(IMemAllocator * iface)
/* free memory */
if (!VirtualFree(This->pMemory, 0, MEM_RELEASE))
{
ERR("Couldn't free memory. Error: %u\n", GetLastError());
ERR("Failed to free memory, error %lu.\n", GetLastError());
return HRESULT_FROM_WIN32(GetLastError());
}

4
dlls/quartz/passthrough.c
View file

@ -66,7 +66,7 @@ static ULONG WINAPI seeking_passthrough_AddRef(IUnknown *iface)
struct seeking_passthrough *passthrough = impl_from_IUnknown(iface);
ULONG refcount = InterlockedIncrement(&passthrough->refcount);
TRACE("%p increasing refcount to %u.\n", passthrough, refcount);
TRACE("%p increasing refcount to %lu.\n", passthrough, refcount);
return refcount;
}
@ -75,7 +75,7 @@ static ULONG WINAPI seeking_passthrough_Release(IUnknown *iface)
struct seeking_passthrough *passthrough = impl_from_IUnknown(iface);
ULONG refcount = InterlockedDecrement(&passthrough->refcount);
TRACE("%p decreasing refcount to %u.\n", passthrough, refcount);
TRACE("%p decreasing refcount to %lu.\n", passthrough, refcount);
if (!refcount)
{
strmbase_passthrough_cleanup(&passthrough->passthrough);

2
dlls/quartz/regsvr.c
View file

@ -127,7 +127,7 @@ static HRESULT register_filters(struct regsvr_filter const *list)
}
if (FAILED(hr)) {
ERR("failed to register with hresult 0x%x\n", hr);
ERR("failed to register with hresult %#lx\n", hr);
CoTaskMemFree(prfp2);
break;
}

15
dlls/quartz/systemclock.c
View file

@ -25,7 +25,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(quartz);
static int cookie_counter;
static LONG cookie_counter;
struct advise_sink
{
@ -42,7 +42,8 @@ struct system_clock
IUnknown *outer_unk;
LONG refcount;
BOOL thread_created, thread_stopped;
LONG thread_created;
BOOL thread_stopped;
HANDLE thread;
LARGE_INTEGER frequency;
REFERENCE_TIME last_time;
@ -90,7 +91,7 @@ static ULONG WINAPI system_clock_inner_AddRef(IUnknown *iface)
struct system_clock *clock = impl_from_IUnknown(iface);
ULONG refcount = InterlockedIncrement(&clock->refcount);
TRACE("%p increasing refcount to %u.\n", clock, refcount);
TRACE("%p increasing refcount to %lu.\n", clock, refcount);
return refcount;
}
@ -101,7 +102,7 @@ static ULONG WINAPI system_clock_inner_Release(IUnknown *iface)
ULONG refcount = InterlockedDecrement(&clock->refcount);
struct advise_sink *sink, *cursor;
TRACE("%p decreasing refcount to %u.\n", clock, refcount);
TRACE("%p decreasing refcount to %lu.\n", clock, refcount);
if (!refcount)
{
@ -267,7 +268,7 @@ static HRESULT WINAPI SystemClockImpl_AdviseTime(IReferenceClock *iface,
{
struct system_clock *clock = impl_from_IReferenceClock(iface);
TRACE("clock %p, base %s, offset %s, event %#lx, cookie %p.\n",
TRACE("clock %p, base %s, offset %s, event %#Ix, cookie %p.\n",
clock, debugstr_time(base), debugstr_time(offset), event, cookie);
if (base + offset <= 0)
@ -281,7 +282,7 @@ static HRESULT WINAPI SystemClockImpl_AdvisePeriodic(IReferenceClock* iface,
{
struct system_clock *clock = impl_from_IReferenceClock(iface);
TRACE("clock %p, start %s, period %s, semaphore %#lx, cookie %p.\n",
TRACE("clock %p, start %s, period %s, semaphore %#Ix, cookie %p.\n",
clock, debugstr_time(start), debugstr_time(period), semaphore, cookie);
if (start <= 0 || period <= 0)
@ -295,7 +296,7 @@ static HRESULT WINAPI SystemClockImpl_Unadvise(IReferenceClock *iface, DWORD_PTR
struct system_clock *clock = impl_from_IReferenceClock(iface);
struct advise_sink *sink;
TRACE("clock %p, cookie %#lx.\n", clock, cookie);
TRACE("clock %p, cookie %#Ix.\n", clock, cookie);
EnterCriticalSection(&clock->cs);

10
dlls/quartz/videorenderer.c
View file

@ -92,7 +92,7 @@ static HRESULT video_renderer_render(struct strmbase_renderer *iface, IMediaSamp
hr = IMediaSample_GetPointer(pSample, &pbSrcStream);
if (FAILED(hr))
{
ERR("Cannot get pointer to sample data (%x)\n", hr);
ERR("Failed to get buffer pointer, hr %#lx.\n", hr);
return hr;
}
@ -277,7 +277,7 @@ static HRESULT WINAPI VideoWindow_get_FullScreenMode(IVideoWindow *iface,
{
struct video_renderer *This = impl_from_IVideoWindow(iface);
TRACE("(%p/%p)->(%p): %d\n", This, iface, FullScreenMode, This->FullScreenMode);
TRACE("window %p, fullscreen %p.\n", This, FullScreenMode);
if (!FullScreenMode)
return E_POINTER;
@ -292,7 +292,7 @@ static HRESULT WINAPI VideoWindow_put_FullScreenMode(IVideoWindow *iface, LONG f
struct video_renderer *filter = impl_from_IVideoWindow(iface);
HWND window = filter->window.hwnd;
FIXME("filter %p, fullscreen %d.\n", filter, fullscreen);
FIXME("filter %p, fullscreen %ld.\n", filter, fullscreen);
if (fullscreen)
{
@ -399,7 +399,7 @@ static HRESULT WINAPI overlay_GetPalette(IOverlay *iface, DWORD *count, PALETTEE
static HRESULT WINAPI overlay_SetPalette(IOverlay *iface, DWORD count, PALETTEENTRY *palette)
{
FIXME("iface %p, count %u, palette %p, stub!\n", iface, count, palette);
FIXME("iface %p, count %lu, palette %p, stub!\n", iface, count, palette);
return E_NOTIMPL;
}
@ -445,7 +445,7 @@ static HRESULT WINAPI overlay_GetVideoPosition(IOverlay *iface, RECT *source, RE
static HRESULT WINAPI overlay_Advise(IOverlay *iface, IOverlayNotify *sink, DWORD flags)
{
FIXME("iface %p, sink %p, flags %#x, stub!\n", iface, sink, flags);
FIXME("iface %p, sink %p, flags %#lx, stub!\n", iface, sink, flags);
return E_NOTIMPL;
}

121
dlls/quartz/vmr9.c
View file

@ -244,7 +244,7 @@ static HRESULT vmr_render(struct strmbase_renderer *iface, IMediaSample *sample)
if (FAILED(hr = IMediaSample_GetPointer(sample, &data)))
{
ERR("Failed to get pointer to sample data, hr %#x.\n", hr);
ERR("Failed to get pointer to sample data, hr %#lx.\n", hr);
return hr;
}
data_size = IMediaSample_GetActualDataLength(sample);
@ -267,7 +267,7 @@ static HRESULT vmr_render(struct strmbase_renderer *iface, IMediaSample *sample)
if (FAILED(hr = IDirect3DSurface9_LockRect(info.lpSurf, &locked_rect, NULL, D3DLOCK_DISCARD)))
{
ERR("Failed to lock surface, hr %#x.\n", hr);
ERR("Failed to lock surface, hr %#lx.\n", hr);
return hr;
}
@ -332,7 +332,7 @@ static HRESULT initialize_device(struct quartz_vmr *filter, VMR9AllocationInfo *
if (FAILED(hr = IVMRSurfaceAllocator9_InitializeDevice(filter->allocator,
filter->cookie, info, &count)))
{
WARN("Failed to initialize device (flags %#x), hr %#x.\n", info->dwFlags, hr);
WARN("Failed to initialize device (flags %#lx), hr %#lx.\n", info->dwFlags, hr);
return hr;
}
@ -341,7 +341,7 @@ static HRESULT initialize_device(struct quartz_vmr *filter, VMR9AllocationInfo *
if (FAILED(hr = IVMRSurfaceAllocator9_GetSurface(filter->allocator,
filter->cookie, i, 0, &filter->surfaces[i])))
{
ERR("Failed to get surface %u, hr %#x.\n", i, hr);
ERR("Failed to get surface %lu, hr %#lx.\n", i, hr);
while (i--)
IDirect3DSurface9_Release(filter->surfaces[i]);
IVMRSurfaceAllocator9_TerminateDevice(filter->allocator, filter->cookie);
@ -425,7 +425,7 @@ static HRESULT allocate_surfaces(struct quartz_vmr *filter, const AM_MEDIA_TYPE
break;
default:
WARN("Unhandled video compression %#x.\n", filter->bmiheader.biCompression);
WARN("Unhandled video compression %#lx.\n", filter->bmiheader.biCompression);
free(filter->surfaces);
return VFW_E_TYPE_NOT_ACCEPTED;
}
@ -882,11 +882,12 @@ static HRESULT WINAPI VMR7FilterConfig_SetImageCompositor(IVMRFilterConfig *ifac
return E_NOTIMPL;
}
static HRESULT WINAPI VMR7FilterConfig_SetNumberOfStreams(IVMRFilterConfig *iface, DWORD max)
static HRESULT WINAPI VMR7FilterConfig_SetNumberOfStreams(IVMRFilterConfig *iface, DWORD count)
{
struct quartz_vmr *This = impl_from_IVMRFilterConfig(iface);
struct quartz_vmr *filter = impl_from_IVMRFilterConfig(iface);
FIXME("filter %p, count %lu, stub!\n", filter, count);
FIXME("(%p/%p)->(%u) stub\n", iface, This, max);
return E_NOTIMPL;
}
@ -898,11 +899,12 @@ static HRESULT WINAPI VMR7FilterConfig_GetNumberOfStreams(IVMRFilterConfig *ifac
return E_NOTIMPL;
}
static HRESULT WINAPI VMR7FilterConfig_SetRenderingPrefs(IVMRFilterConfig *iface, DWORD renderflags)
static HRESULT WINAPI VMR7FilterConfig_SetRenderingPrefs(IVMRFilterConfig *iface, DWORD flags)
{
struct quartz_vmr *This = impl_from_IVMRFilterConfig(iface);
struct quartz_vmr *filter = impl_from_IVMRFilterConfig(iface);
FIXME("filter %p, flags %#lx, stub!\n", filter, flags);
FIXME("(%p/%p)->(%u) stub\n", iface, This, renderflags);
return E_NOTIMPL;
}
@ -918,7 +920,7 @@ static HRESULT WINAPI VMR7FilterConfig_SetRenderingMode(IVMRFilterConfig *iface,
{
struct quartz_vmr *filter = impl_from_IVMRFilterConfig(iface);
TRACE("iface %p, mode %#x.\n", iface, mode);
TRACE("iface %p, mode %#lx.\n", iface, mode);
return IVMRFilterConfig9_SetRenderingMode(&filter->IVMRFilterConfig9_iface, mode);
}
@ -1104,7 +1106,7 @@ static HRESULT WINAPI VMR7MonitorConfig_GetAvailableMonitors(IVMRMonitorConfig *
struct quartz_vmr *This = impl_from_IVMRMonitorConfig(iface);
struct get_available_monitors_args args;
FIXME("(%p/%p)->(%p, %u, %p) semi-stub\n", iface, This, info, arraysize, numdev);
TRACE("filter %p, info %p, arraysize %lu, numdev %p.\n", This, info, arraysize, numdev);
if (!numdev)
return E_POINTER;
@ -1204,7 +1206,7 @@ static HRESULT WINAPI VMR9MonitorConfig_GetAvailableMonitors(IVMRMonitorConfig9
struct quartz_vmr *This = impl_from_IVMRMonitorConfig9(iface);
struct get_available_monitors_args args;
FIXME("(%p/%p)->(%p, %u, %p) semi-stub\n", iface, This, info, arraysize, numdev);
TRACE("filter %p, info %p, arraysize %lu, numdev %p.\n", This, info, arraysize, numdev);
if (!numdev)
return E_POINTER;
@ -1264,7 +1266,7 @@ static HRESULT WINAPI VMR9FilterConfig_SetNumberOfStreams(IVMRFilterConfig9 *ifa
{
struct quartz_vmr *filter = impl_from_IVMRFilterConfig9(iface);
FIXME("iface %p, count %u, stub!\n", iface, count);
FIXME("iface %p, count %lu, stub!\n", iface, count);
if (!count)
{
@ -1307,11 +1309,12 @@ static HRESULT WINAPI VMR9FilterConfig_GetNumberOfStreams(IVMRFilterConfig9 *ifa
return S_OK;
}
static HRESULT WINAPI VMR9FilterConfig_SetRenderingPrefs(IVMRFilterConfig9 *iface, DWORD renderflags)
static HRESULT WINAPI VMR9FilterConfig_SetRenderingPrefs(IVMRFilterConfig9 *iface, DWORD flags)
{
struct quartz_vmr *This = impl_from_IVMRFilterConfig9(iface);
struct quartz_vmr *filter = impl_from_IVMRFilterConfig9(iface);
TRACE("filter %p, flags %#lx.\n", filter, flags);
FIXME("(%p/%p)->(%u) stub\n", iface, This, renderflags);
return E_NOTIMPL;
}
@ -1328,7 +1331,7 @@ static HRESULT WINAPI VMR9FilterConfig_SetRenderingMode(IVMRFilterConfig9 *iface
HRESULT hr = S_OK;
struct quartz_vmr *This = impl_from_IVMRFilterConfig9(iface);
TRACE("(%p/%p)->(%u)\n", iface, This, mode);
TRACE("filter %p, mode %lu.\n", This, mode);
EnterCriticalSection(&This->renderer.filter.filter_cs);
if (This->mode)
@ -1353,14 +1356,14 @@ static HRESULT WINAPI VMR9FilterConfig_SetRenderingMode(IVMRFilterConfig9 *iface
if (FAILED(hr = VMR9DefaultAllocatorPresenterImpl_create(This, (void **)&This->presenter)))
{
ERR("Failed to create default presenter, hr %#x.\n", hr);
ERR("Failed to create default presenter, hr %#lx.\n", hr);
break;
}
if (FAILED(hr = IVMRImagePresenter9_QueryInterface(This->presenter,
&IID_IVMRSurfaceAllocator9, (void **)&This->allocator)))
{
ERR("Failed to query for IVMRSurfaceAllocator9, hr %#x.\n", hr);
ERR("Failed to query for IVMRSurfaceAllocator9, hr %#lx.\n", hr);
IVMRImagePresenter9_Release(This->presenter);
This->allocator = NULL;
This->presenter = NULL;
@ -1720,7 +1723,7 @@ static HRESULT WINAPI VMR9WindowlessControl_SetAspectRatioMode(IVMRWindowlessCon
{
struct quartz_vmr *filter = impl_from_IVMRWindowlessControl9(iface);
TRACE("filter %p, mode %u.\n", filter, mode);
TRACE("filter %p, mode %lu.\n", filter, mode);
EnterCriticalSection(&filter->renderer.filter.filter_cs);
filter->aspect_mode = mode;
@ -1936,7 +1939,7 @@ static ULONG WINAPI VMR9SurfaceAllocatorNotify_AddRef(IVMRSurfaceAllocatorNotify
struct quartz_vmr *filter = impl_from_IVMRSurfaceAllocatorNotify9(iface);
ULONG refcount = InterlockedIncrement(&filter->IVMRSurfaceAllocatorNotify9_refcount);
TRACE("%p increasing refcount to %u.\n", iface, refcount);
TRACE("%p increasing refcount to %lu.\n", iface, refcount);
return refcount;
}
@ -1946,7 +1949,7 @@ static ULONG WINAPI VMR9SurfaceAllocatorNotify_Release(IVMRSurfaceAllocatorNotif
struct quartz_vmr *filter = impl_from_IVMRSurfaceAllocatorNotify9(iface);
ULONG refcount = InterlockedDecrement(&filter->IVMRSurfaceAllocatorNotify9_refcount);
TRACE("%p decreasing refcount to %u.\n", iface, refcount);
TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount && !filter->renderer.filter.refcount)
free(filter);
@ -2031,7 +2034,7 @@ static HRESULT WINAPI VMR9SurfaceAllocatorNotify_AllocateSurfaceHelper(IVMRSurfa
if (!allocinfo || !numbuffers || !surface)
return E_POINTER;
TRACE("Flags %#x, size %ux%u, format %u (%#x), pool %u, minimum buffers %u.\n",
TRACE("Flags %#lx, size %lux%lu, format %u (%#x), pool %u, minimum buffers %lu.\n",
allocinfo->dwFlags, allocinfo->dwWidth, allocinfo->dwHeight,
allocinfo->Format, allocinfo->Format, allocinfo->Pool, allocinfo->MinBuffers);
@ -2056,7 +2059,7 @@ static HRESULT WINAPI VMR9SurfaceAllocatorNotify_AllocateSurfaceHelper(IVMRSurfa
if (!*numbuffers || *numbuffers < allocinfo->MinBuffers)
{
WARN("%u surfaces requested (minimum %u); returning E_INVALIDARG.\n",
WARN("%lu surfaces requested (minimum %lu); returning E_INVALIDARG.\n",
*numbuffers, allocinfo->MinBuffers);
return E_INVALIDARG;
}
@ -2103,12 +2106,12 @@ static HRESULT WINAPI VMR9SurfaceAllocatorNotify_AllocateSurfaceHelper(IVMRSurfa
}
else
{
FIXME("Unhandled flags %#x.\n", allocinfo->dwFlags);
FIXME("Unhandled flags %#lx.\n", allocinfo->dwFlags);
return E_NOTIMPL;
}
if (FAILED(hr))
WARN("%u/%u surfaces allocated, hr %#x.\n", i, *numbuffers, hr);
WARN("%lu/%lu surfaces allocated, hr %#lx.\n", i, *numbuffers, hr);
if (i >= allocinfo->MinBuffers)
{
@ -2170,7 +2173,7 @@ static HRESULT WINAPI mixer_control9_SetAlpha(IVMRMixerControl9 *iface, DWORD st
{
struct quartz_vmr *filter = impl_from_IVMRMixerControl9(iface);
FIXME("filter %p, stream %u, alpha %.8e, stub!\n", filter, stream, alpha);
FIXME("filter %p, stream %lu, alpha %.8e, stub!\n", filter, stream, alpha);
return E_NOTIMPL;
}
@ -2179,7 +2182,7 @@ static HRESULT WINAPI mixer_control9_GetAlpha(IVMRMixerControl9 *iface, DWORD st
{
struct quartz_vmr *filter = impl_from_IVMRMixerControl9(iface);
FIXME("filter %p, stream %u, alpha %p, stub!\n", filter, stream, alpha);
FIXME("filter %p, stream %lu, alpha %p, stub!\n", filter, stream, alpha);
return E_NOTIMPL;
}
@ -2188,7 +2191,7 @@ static HRESULT WINAPI mixer_control9_SetZOrder(IVMRMixerControl9 *iface, DWORD s
{
struct quartz_vmr *filter = impl_from_IVMRMixerControl9(iface);
FIXME("filter %p, stream %u, z %u, stub!\n", filter, stream, z);
FIXME("filter %p, stream %lu, z %lu, stub!\n", filter, stream, z);
return E_NOTIMPL;
}
@ -2197,7 +2200,7 @@ static HRESULT WINAPI mixer_control9_GetZOrder(IVMRMixerControl9 *iface, DWORD s
{
struct quartz_vmr *filter = impl_from_IVMRMixerControl9(iface);
FIXME("filter %p, stream %u, z %p, stub!\n", filter, stream, z);
FIXME("filter %p, stream %lu, z %p, stub!\n", filter, stream, z);
return E_NOTIMPL;
}
@ -2207,7 +2210,7 @@ static HRESULT WINAPI mixer_control9_SetOutputRect(IVMRMixerControl9 *iface,
{
struct quartz_vmr *filter = impl_from_IVMRMixerControl9(iface);
FIXME("filter %p, stream %u, rect %s, stub!\n", filter, stream, debugstr_normalized_rect(rect));
FIXME("filter %p, stream %lu, rect %s, stub!\n", filter, stream, debugstr_normalized_rect(rect));
return E_NOTIMPL;
}
@ -2217,7 +2220,7 @@ static HRESULT WINAPI mixer_control9_GetOutputRect(IVMRMixerControl9 *iface,
{
struct quartz_vmr *filter = impl_from_IVMRMixerControl9(iface);
FIXME("filter %p, stream %u, rect %p, stub!\n", filter, stream, rect);
FIXME("filter %p, stream %lu, rect %p, stub!\n", filter, stream, rect);
return E_NOTIMPL;
}
@ -2226,7 +2229,7 @@ static HRESULT WINAPI mixer_control9_SetBackgroundClr(IVMRMixerControl9 *iface,
{
struct quartz_vmr *filter = impl_from_IVMRMixerControl9(iface);
FIXME("filter %p, color #%06x, stub!\n", filter, color);
FIXME("filter %p, color #%06lx, stub!\n", filter, color);
return E_NOTIMPL;
}
@ -2244,7 +2247,7 @@ static HRESULT WINAPI mixer_control9_SetMixingPrefs(IVMRMixerControl9 *iface, DW
{
struct quartz_vmr *filter = impl_from_IVMRMixerControl9(iface);
FIXME("filter %p, flags %#x, stub!\n", filter, flags);
FIXME("filter %p, flags %#lx, stub!\n", filter, flags);
EnterCriticalSection(&filter->renderer.filter.filter_cs);
filter->mixing_prefs = flags;
@ -2341,7 +2344,7 @@ static HRESULT WINAPI mixer_bitmap9_SetAlphaBitmap(IVMRMixerBitmap9 *iface,
const VMR9AlphaBitmap *bitmap)
{
FIXME("iface %p, bitmap %p, stub!\n", iface, bitmap);
TRACE("dwFlags %#x, hdc %p, pDDS %p, rSrc %s, rDest %s, fAlpha %.8e, clrSrcKey #%06x, dwFilterMode %#x.\n",
TRACE("dwFlags %#lx, hdc %p, pDDS %p, rSrc %s, rDest %s, fAlpha %.8e, clrSrcKey #%06lx, dwFilterMode %#lx.\n",
bitmap->dwFlags, bitmap->hdc, bitmap->pDDS, wine_dbgstr_rect(&bitmap->rSrc),
debugstr_normalized_rect(&bitmap->rDest), bitmap->fAlpha, bitmap->clrSrcKey, bitmap->dwFilterMode);
return E_NOTIMPL;
@ -2410,7 +2413,7 @@ static HRESULT WINAPI aspect_ratio_control9_SetAspectRatioMode(IVMRAspectRatioCo
{
struct quartz_vmr *filter = impl_from_IVMRAspectRatioControl9(iface);
TRACE("filter %p, mode %u.\n", filter, mode);
TRACE("filter %p, mode %lu.\n", filter, mode);
EnterCriticalSection(&filter->renderer.filter.filter_cs);
filter->aspect_mode = mode;
@ -2458,7 +2461,7 @@ static HRESULT WINAPI overlay_GetPalette(IOverlay *iface, DWORD *count, PALETTEE
static HRESULT WINAPI overlay_SetPalette(IOverlay *iface, DWORD count, PALETTEENTRY *palette)
{
FIXME("iface %p, count %u, palette %p, stub!\n", iface, count, palette);
FIXME("iface %p, count %lu, palette %p, stub!\n", iface, count, palette);
return E_NOTIMPL;
}
@ -2507,7 +2510,7 @@ static HRESULT WINAPI overlay_GetVideoPosition(IOverlay *iface, RECT *source, RE
static HRESULT WINAPI overlay_Advise(IOverlay *iface, IOverlayNotify *sink, DWORD flags)
{
FIXME("iface %p, sink %p, flags %#x, stub!\n", iface, sink, flags);
FIXME("iface %p, sink %p, flags %#lx, stub!\n", iface, sink, flags);
return E_NOTIMPL;
}
@ -2623,32 +2626,30 @@ static HRESULT WINAPI VMR9_ImagePresenter_QueryInterface(IVMRImagePresenter9 *if
static ULONG WINAPI VMR9_ImagePresenter_AddRef(IVMRImagePresenter9 *iface)
{
struct default_presenter *This = impl_from_IVMRImagePresenter9(iface);
ULONG refCount = InterlockedIncrement(&This->refCount);
struct default_presenter *presenter = impl_from_IVMRImagePresenter9(iface);
ULONG refcount = InterlockedIncrement(&presenter->refCount);
TRACE("(%p)->() AddRef from %d\n", iface, refCount - 1);
TRACE("%p increasing refcount to %lu.\n", presenter, refcount);
return refCount;
return refcount;
}
static ULONG WINAPI VMR9_ImagePresenter_Release(IVMRImagePresenter9 *iface)
{
struct default_presenter *This = impl_from_IVMRImagePresenter9(iface);
ULONG refCount = InterlockedDecrement(&This->refCount);
ULONG refcount = InterlockedDecrement(&This->refCount);
TRACE("(%p)->() Release from %d\n", iface, refCount + 1);
TRACE("%p decreasing refcount to %lu.\n", This, refcount);
if (!refCount)
if (!refcount)
{
DWORD i;
TRACE("Destroying\n");
IDirect3D9_Release(This->d3d9_ptr);
TRACE("Number of surfaces: %u\n", This->num_surfaces);
for (i = 0; i < This->num_surfaces; ++i)
{
IDirect3DSurface9 *surface = This->d3d9_surfaces[i];
TRACE("Releasing surface %p\n", surface);
if (surface)
IDirect3DSurface9_Release(surface);
}
@ -2661,7 +2662,7 @@ static ULONG WINAPI VMR9_ImagePresenter_Release(IVMRImagePresenter9 *iface)
free(This);
return 0;
}
return refCount;
return refcount;
}
static HRESULT WINAPI VMR9_ImagePresenter_StartPresenting(IVMRImagePresenter9 *iface, DWORD_PTR cookie)
@ -2701,23 +2702,23 @@ static HRESULT WINAPI VMR9_ImagePresenter_PresentImage(IVMRImagePresenter9 *ifac
if (FAILED(hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET,
D3DCOLOR_XRGB(0, 0, 0), 1.0f, 0)))
ERR("Failed to clear, hr %#x.\n", hr);
ERR("Failed to clear, hr %#lx.\n", hr);
if (FAILED(hr = IDirect3DDevice9_BeginScene(device)))
ERR("Failed to begin scene, hr %#x.\n", hr);
ERR("Failed to begin scene, hr %#lx.\n", hr);
if (FAILED(hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer)))
{
ERR("Failed to get backbuffer, hr %#x.\n", hr);
ERR("Failed to get backbuffer, hr %#lx.\n", hr);
return hr;
}
if (FAILED(hr = IDirect3DDevice9_StretchRect(device, info->lpSurf, NULL, backbuffer, NULL, D3DTEXF_POINT)))
ERR("Failed to blit image, hr %#x.\n", hr);
ERR("Failed to blit image, hr %#lx.\n", hr);
IDirect3DSurface9_Release(backbuffer);
if (FAILED(hr = IDirect3DDevice9_EndScene(device)))
ERR("Failed to end scene, hr %#x.\n", hr);
ERR("Failed to end scene, hr %#lx.\n", hr);
if (filter->aspect_mode == VMR9ARMode_LetterBox)
{
@ -2745,7 +2746,7 @@ static HRESULT WINAPI VMR9_ImagePresenter_PresentImage(IVMRImagePresenter9 *ifac
}
if (FAILED(hr = IDirect3DDevice9_Present(device, &src, &dst, NULL, NULL)))
ERR("Failed to present, hr %#x.\n", hr);
ERR("Failed to present, hr %#lx.\n", hr);
return S_OK;
}
@ -2873,7 +2874,7 @@ static HRESULT WINAPI VMR9_SurfaceAllocator_InitializeDevice(IVMRSurfaceAllocato
NULL, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device);
if (FAILED(hr))
{
ERR("Could not create device: %08x\n", hr);
ERR("Failed to create device, hr %#lx.\n", hr);
return hr;
}
@ -2897,7 +2898,7 @@ static HRESULT WINAPI VMR9_SurfaceAllocator_InitializeDevice(IVMRSurfaceAllocato
info, numbuffers, This->d3d9_surfaces);
if (FAILED(hr))
{
ERR("Failed to allocate surfaces, hr %#x.\n", hr);
ERR("Failed to allocate surfaces, hr %#lx.\n", hr);
IVMRSurfaceAllocator9_TerminateDevice(This->pVMR9->allocator, This->pVMR9->cookie);
return hr;
}
@ -2909,7 +2910,7 @@ static HRESULT WINAPI VMR9_SurfaceAllocator_InitializeDevice(IVMRSurfaceAllocato
static HRESULT WINAPI VMR9_SurfaceAllocator_TerminateDevice(IVMRSurfaceAllocator9 *iface, DWORD_PTR cookie)
{
TRACE("iface %p, cookie %#lx.\n", iface, cookie);
TRACE("iface %p, cookie %#Ix.\n", iface, cookie);
return S_OK;
}

83
dlls/quartz/window.c
View file

@ -105,7 +105,7 @@ HRESULT video_window_create_window(struct video_window *window)
winclass.lpszClassName = class_name;
if (!RegisterClassW(&winclass) && GetLastError() != ERROR_CLASS_ALREADY_EXISTS)
{
ERR("Unable to register window class: %u\n", GetLastError());
ERR("Failed to register class, error %lu.\n", GetLastError());
return E_FAIL;
}
@ -151,7 +151,7 @@ HRESULT WINAPI BaseControlWindowImpl_GetTypeInfoCount(IVideoWindow *iface, UINT
HRESULT WINAPI BaseControlWindowImpl_GetTypeInfo(IVideoWindow *iface, UINT index,
LCID lcid, ITypeInfo **typeinfo)
{
TRACE("iface %p, index %u, lcid %#x, typeinfo %p.\n", iface, index, lcid, typeinfo);
TRACE("iface %p, index %u, lcid %#lx, typeinfo %p.\n", iface, index, lcid, typeinfo);
return strmbase_get_typeinfo(IVideoWindow_tid, typeinfo);
}
@ -161,7 +161,7 @@ HRESULT WINAPI BaseControlWindowImpl_GetIDsOfNames(IVideoWindow *iface, REFIID i
ITypeInfo *typeinfo;
HRESULT hr;
TRACE("iface %p, iid %s, names %p, count %u, lcid %#x, ids %p.\n",
TRACE("iface %p, iid %s, names %p, count %u, lcid %#lx, ids %p.\n",
iface, debugstr_guid(iid), names, count, lcid, ids);
if (SUCCEEDED(hr = strmbase_get_typeinfo(IVideoWindow_tid, &typeinfo)))
@ -178,7 +178,7 @@ HRESULT WINAPI BaseControlWindowImpl_Invoke(IVideoWindow *iface, DISPID id, REFI
ITypeInfo *typeinfo;
HRESULT hr;
TRACE("iface %p, id %d, iid %s, lcid %#x, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n",
TRACE("iface %p, id %ld, iid %s, lcid %#lx, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n",
iface, id, debugstr_guid(iid), lcid, flags, params, result, excepinfo, error_arg);
if (SUCCEEDED(hr = strmbase_get_typeinfo(IVideoWindow_tid, &typeinfo)))
@ -225,7 +225,7 @@ HRESULT WINAPI BaseControlWindowImpl_put_WindowStyle(IVideoWindow *iface, LONG s
{
struct video_window *window = impl_from_IVideoWindow(iface);
TRACE("window %p, style %#x.\n", window, style);
TRACE("window %p, style %#lx.\n", window, style);
if (style & (WS_DISABLED|WS_HSCROLL|WS_MAXIMIZE|WS_MINIMIZE|WS_VSCROLL))
return E_INVALIDARG;
@ -250,7 +250,7 @@ HRESULT WINAPI BaseControlWindowImpl_put_WindowStyleEx(IVideoWindow *iface, LONG
{
struct video_window *window = impl_from_IVideoWindow(iface);
TRACE("window %p, style %#x.\n", window, style);
TRACE("window %p, style %#lx.\n", window, style);
if (!SetWindowLongW(window->hwnd, GWL_EXSTYLE, style))
return E_FAIL;
@ -271,7 +271,7 @@ HRESULT WINAPI BaseControlWindowImpl_put_AutoShow(IVideoWindow *iface, LONG Auto
{
struct video_window *This = impl_from_IVideoWindow(iface);
TRACE("(%p/%p)->(%d)\n", This, iface, AutoShow);
TRACE("window %p, AutoShow %ld.\n", This, AutoShow);
This->AutoShow = AutoShow;
@ -293,7 +293,7 @@ HRESULT WINAPI BaseControlWindowImpl_put_WindowState(IVideoWindow *iface, LONG s
{
struct video_window *window = impl_from_IVideoWindow(iface);
TRACE("window %p, state %#x.\n", window, state);
TRACE("window %p, state %ld.\n", window, state);
ShowWindow(window->hwnd, state);
return S_OK;
@ -323,7 +323,7 @@ HRESULT WINAPI BaseControlWindowImpl_put_BackgroundPalette(IVideoWindow *iface,
{
struct video_window *This = impl_from_IVideoWindow(iface);
FIXME("(%p/%p)->(%d): stub !!!\n", This, iface, BackgroundPalette);
FIXME("window %p, palette %ld, stub!\n", This, BackgroundPalette);
return S_OK;
}
@ -341,7 +341,7 @@ HRESULT WINAPI BaseControlWindowImpl_put_Visible(IVideoWindow *iface, LONG visib
{
struct video_window *window = impl_from_IVideoWindow(iface);
TRACE("window %p, visible %d.\n", window, visible);
TRACE("window %p, visible %ld.\n", window, visible);
ShowWindow(window->hwnd, visible ? SW_SHOW : SW_HIDE);
return S_OK;
@ -365,7 +365,7 @@ HRESULT WINAPI BaseControlWindowImpl_put_Left(IVideoWindow *iface, LONG left)
struct video_window *window = impl_from_IVideoWindow(iface);
RECT rect;
TRACE("window %p, left %d.\n", window, left);
TRACE("window %p, left %ld.\n", window, left);
GetWindowRect(window->hwnd, &rect);
if (!SetWindowPos(window->hwnd, NULL, left, rect.top, 0, 0,
@ -392,7 +392,7 @@ HRESULT WINAPI BaseControlWindowImpl_put_Width(IVideoWindow *iface, LONG width)
struct video_window *window = impl_from_IVideoWindow(iface);
RECT rect;
TRACE("window %p, width %d.\n", window, width);
TRACE("window %p, width %ld.\n", window, width);
GetWindowRect(window->hwnd, &rect);
if (!SetWindowPos(window->hwnd, NULL, 0, 0, width, rect.bottom - rect.top,
@ -419,7 +419,7 @@ HRESULT WINAPI BaseControlWindowImpl_put_Top(IVideoWindow *iface, LONG top)
struct video_window *window = impl_from_IVideoWindow(iface);
RECT rect;
TRACE("window %p, top %d.\n", window, top);
TRACE("window %p, top %ld.\n", window, top);
GetWindowRect(window->hwnd, &rect);
if (!SetWindowPos(window->hwnd, NULL, rect.left, top, 0, 0,
@ -446,7 +446,7 @@ HRESULT WINAPI BaseControlWindowImpl_put_Height(IVideoWindow *iface, LONG height
struct video_window *window = impl_from_IVideoWindow(iface);
RECT rect;
TRACE("window %p, height %d.\n", window, height);
TRACE("window %p, height %ld.\n", window, height);
GetWindowRect(window->hwnd, &rect);
if (!SetWindowPos(window->hwnd, NULL, 0, 0, rect.right - rect.left,
@ -473,7 +473,7 @@ HRESULT WINAPI BaseControlWindowImpl_put_Owner(IVideoWindow *iface, OAHWND owner
struct video_window *window = impl_from_IVideoWindow(iface);
HWND hwnd = window->hwnd;
TRACE("window %p, owner %#lx.\n", window, owner);
TRACE("window %p, owner %#Ix.\n", window, owner);
/* Make sure we are marked as WS_CHILD before reparenting ourselves, so that
* we do not steal focus. LEGO Island depends on this. */
@ -503,7 +503,7 @@ HRESULT WINAPI BaseControlWindowImpl_put_MessageDrain(IVideoWindow *iface, OAHWN
{
struct video_window *This = impl_from_IVideoWindow(iface);
TRACE("(%p/%p)->(%08x)\n", This, iface, (DWORD) Drain);
TRACE("window %p, drain %#Ix.\n", This, Drain);
This->hwndDrain = (HWND)Drain;
@ -534,7 +534,7 @@ HRESULT WINAPI BaseControlWindowImpl_put_BorderColor(IVideoWindow *iface, LONG C
{
struct video_window *This = impl_from_IVideoWindow(iface);
FIXME("(%p/%p)->(%d): stub !!!\n", This, iface, Color);
TRACE("window %p, colour %#lx.\n", This, Color);
return S_OK;
}
@ -546,9 +546,12 @@ HRESULT WINAPI BaseControlWindowImpl_get_FullScreenMode(IVideoWindow *iface, LON
return E_NOTIMPL;
}
HRESULT WINAPI BaseControlWindowImpl_put_FullScreenMode(IVideoWindow *iface, LONG FullScreenMode)
HRESULT WINAPI BaseControlWindowImpl_put_FullScreenMode(IVideoWindow *iface, LONG fullscreen)
{
TRACE("(%p)->(%d)\n", iface, FullScreenMode);
struct video_window *window = impl_from_IVideoWindow(iface);
TRACE("window %p, fullscreen %ld.\n", window, fullscreen);
return E_NOTIMPL;
}
@ -557,7 +560,7 @@ HRESULT WINAPI BaseControlWindowImpl_SetWindowForeground(IVideoWindow *iface, LO
struct video_window *window = impl_from_IVideoWindow(iface);
UINT flags = SWP_NOMOVE | SWP_NOSIZE;
TRACE("window %p, focus %d.\n", window, focus);
TRACE("window %p, focus %ld.\n", window, focus);
if (focus != OAFALSE && focus != OATRUE)
return E_INVALIDARG;
@ -577,7 +580,7 @@ HRESULT WINAPI BaseControlWindowImpl_SetWindowPosition(IVideoWindow *iface,
{
struct video_window *window = impl_from_IVideoWindow(iface);
TRACE("window %p, left %d, top %d, width %d, height %d.\n", window, left, top, width, height);
TRACE("window %p, left %ld, top %ld, width %ld, height %ld.\n", window, left, top, width, height);
if (!SetWindowPos(window->hwnd, NULL, left, top, width, height, SWP_NOACTIVATE | SWP_NOZORDER))
return E_FAIL;
@ -605,7 +608,7 @@ HRESULT WINAPI BaseControlWindowImpl_NotifyOwnerMessage(IVideoWindow *iface,
{
struct video_window *window = impl_from_IVideoWindow(iface);
TRACE("window %p, hwnd %#lx, message %#x, wparam %#lx, lparam %#lx.\n",
TRACE("window %p, hwnd %#Ix, message %#lx, wparam %#Ix, lparam %#Ix.\n",
window, hwnd, message, wparam, lparam);
/* That these messages are forwarded, and no others, is stated by the
@ -661,11 +664,11 @@ HRESULT WINAPI BaseControlWindowImpl_GetRestorePosition(IVideoWindow *iface, LON
return S_OK;
}
HRESULT WINAPI BaseControlWindowImpl_HideCursor(IVideoWindow *iface, LONG HideCursor)
HRESULT WINAPI BaseControlWindowImpl_HideCursor(IVideoWindow *iface, LONG hide)
{
struct video_window *This = impl_from_IVideoWindow(iface);
struct video_window *window = impl_from_IVideoWindow(iface);
FIXME("(%p/%p)->(%d): stub !!!\n", This, iface, HideCursor);
FIXME("window %p, hide %ld, stub!\n", window, hide);
return S_OK;
}
@ -712,7 +715,7 @@ static HRESULT WINAPI basic_video_GetTypeInfoCount(IBasicVideo *iface, UINT *cou
static HRESULT WINAPI basic_video_GetTypeInfo(IBasicVideo *iface, UINT index,
LCID lcid, ITypeInfo **typeinfo)
{
TRACE("iface %p, index %u, lcid %#x, typeinfo %p.\n", iface, index, lcid, typeinfo);
TRACE("iface %p, index %u, lcid %#lx, typeinfo %p.\n", iface, index, lcid, typeinfo);
return strmbase_get_typeinfo(IBasicVideo_tid, typeinfo);
}
@ -722,7 +725,7 @@ static HRESULT WINAPI basic_video_GetIDsOfNames(IBasicVideo *iface, REFIID iid,
ITypeInfo *typeinfo;
HRESULT hr;
TRACE("iface %p, iid %s, names %p, count %u, lcid %#x, ids %p.\n",
TRACE("iface %p, iid %s, names %p, count %u, lcid %#lx, ids %p.\n",
iface, debugstr_guid(iid), names, count, lcid, ids);
if (SUCCEEDED(hr = strmbase_get_typeinfo(IBasicVideo_tid, &typeinfo)))
@ -739,7 +742,7 @@ static HRESULT WINAPI basic_video_Invoke(IBasicVideo *iface, DISPID id, REFIID i
ITypeInfo *typeinfo;
HRESULT hr;
TRACE("iface %p, id %d, iid %s, lcid %#x, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n",
TRACE("iface %p, id %ld, iid %s, lcid %#lx, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n",
iface, id, debugstr_guid(iid), lcid, flags, params, result, excepinfo, error_arg);
if (SUCCEEDED(hr = strmbase_get_typeinfo(IBasicVideo_tid, &typeinfo)))
@ -843,7 +846,7 @@ static HRESULT WINAPI basic_video_put_SourceLeft(IBasicVideo *iface, LONG left)
{
struct video_window *window = impl_from_IBasicVideo(iface);
TRACE("window %p, left %d.\n", window, left);
TRACE("window %p, left %ld.\n", window, left);
if (left < 0 || window->src.right + left - window->src.left > get_bitmap_header(window)->biWidth)
return E_INVALIDARG;
@ -869,7 +872,7 @@ static HRESULT WINAPI basic_video_put_SourceWidth(IBasicVideo *iface, LONG width
{
struct video_window *window = impl_from_IBasicVideo(iface);
TRACE("window %p, width %d.\n", window, width);
TRACE("window %p, width %ld.\n", window, width);
if (width <= 0 || window->src.left + width > get_bitmap_header(window)->biWidth)
return E_INVALIDARG;
@ -895,7 +898,7 @@ static HRESULT WINAPI basic_video_put_SourceTop(IBasicVideo *iface, LONG top)
{
struct video_window *window = impl_from_IBasicVideo(iface);
TRACE("window %p, top %d.\n", window, top);
TRACE("window %p, top %ld.\n", window, top);
if (top < 0 || window->src.bottom + top - window->src.top > get_bitmap_header(window)->biHeight)
return E_INVALIDARG;
@ -921,7 +924,7 @@ static HRESULT WINAPI basic_video_put_SourceHeight(IBasicVideo *iface, LONG heig
{
struct video_window *window = impl_from_IBasicVideo(iface);
TRACE("window %p, height %d.\n", window, height);
TRACE("window %p, height %ld.\n", window, height);
if (height <= 0 || window->src.top + height > get_bitmap_header(window)->biHeight)
return E_INVALIDARG;
@ -947,7 +950,7 @@ static HRESULT WINAPI basic_video_put_DestinationLeft(IBasicVideo *iface, LONG l
{
struct video_window *window = impl_from_IBasicVideo(iface);
TRACE("window %p, left %d.\n", window, left);
TRACE("window %p, left %ld.\n", window, left);
window->default_dst = FALSE;
OffsetRect(&window->dst, left - window->dst.left, 0);
@ -971,7 +974,7 @@ static HRESULT WINAPI basic_video_put_DestinationWidth(IBasicVideo *iface, LONG
{
struct video_window *window = impl_from_IBasicVideo(iface);
TRACE("window %p, width %d.\n", window, width);
TRACE("window %p, width %ld.\n", window, width);
if (width <= 0)
return E_INVALIDARG;
@ -998,7 +1001,7 @@ static HRESULT WINAPI basic_video_put_DestinationTop(IBasicVideo *iface, LONG to
{
struct video_window *window = impl_from_IBasicVideo(iface);
TRACE("window %p, top %d.\n", window, top);
TRACE("window %p, top %ld.\n", window, top);
window->default_dst = FALSE;
OffsetRect(&window->dst, 0, top - window->dst.top);
@ -1022,7 +1025,7 @@ static HRESULT WINAPI basic_video_put_DestinationHeight(IBasicVideo *iface, LONG
{
struct video_window *window = impl_from_IBasicVideo(iface);
TRACE("window %p, height %d.\n", window, height);
TRACE("window %p, height %ld.\n", window, height);
if (height <= 0)
return E_INVALIDARG;
@ -1051,7 +1054,7 @@ static HRESULT WINAPI basic_video_SetSourcePosition(IBasicVideo *iface,
struct video_window *window = impl_from_IBasicVideo(iface);
const BITMAPINFOHEADER *bitmap_header = get_bitmap_header(window);
TRACE("window %p, left %d, top %d, width %d, height %d.\n", window, left, top, width, height);
TRACE("window %p, left %ld, top %ld, width %ld, height %ld.\n", window, left, top, width, height);
if (left < 0 || left + width > bitmap_header->biWidth || width <= 0)
return E_INVALIDARG;
@ -1095,7 +1098,7 @@ static HRESULT WINAPI basic_video_SetDestinationPosition(IBasicVideo *iface,
{
struct video_window *window = impl_from_IBasicVideo(iface);
TRACE("window %p, left %d, top %d, width %d, height %d.\n", window, left, top, width, height);
TRACE("window %p, left %ld, top %ld, width %ld, height %ld.\n", window, left, top, width, height);
if (width <= 0 || height <= 0)
return E_INVALIDARG;
@ -1153,7 +1156,7 @@ static HRESULT WINAPI basic_video_GetVideoPaletteEntries(IBasicVideo *iface,
{
struct video_window *window = impl_from_IBasicVideo(iface);
FIXME("window %p, start %d, count %d, ret_count %p, palette %p, stub!\n",
FIXME("window %p, start %ld, count %ld, ret_count %p, palette %p, stub!\n",
window, start, count, ret_count, palette);
if (!ret_count || !palette)
@ -1244,7 +1247,7 @@ static const IBasicVideoVtbl basic_video_vtbl =
void video_window_unregister_class(void)
{
if (!UnregisterClassW(class_name, NULL) && GetLastError() != ERROR_CLASS_DOES_NOT_EXIST)
ERR("Failed to unregister class, error %u.\n", GetLastError());
ERR("Failed to unregister class, error %lu.\n", GetLastError());
}
void video_window_init(struct video_window *window, const IVideoWindowVtbl *vtbl,