system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 09:25:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

quartz: Win64 printf format warning fixes.

Browse source
This commit is contained in:
Hans Leidekker 2006-10-12 20:57:23 +02:00 committed by Alexandre Julliard
parent 9f06a5a6f0
commit cfbb859f59
23 changed files with 239 additions and 240 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dlls/quartz/Makefile.in
View file

@ -6,7 +6,6 @@ MODULE = quartz.dll
IMPORTLIB = libquartz.$(IMPLIBEXT) IMPORTLIB = libquartz.$(IMPLIBEXT)
IMPORTS = dsound msacm32 msvfw32 ole32 oleaut32 user32 gdi32 advapi32 kernel32 IMPORTS = dsound msacm32 msvfw32 ole32 oleaut32 user32 gdi32 advapi32 kernel32
EXTRALIBS = -lstrmiids -luuid EXTRALIBS = -lstrmiids -luuid
EXTRADEFS = -DWINE_NO_LONG_AS_INT
C_SRCS = \ C_SRCS = \
acmwrapper.c \ acmwrapper.c \

12
dlls/quartz/acmwrapper.c
View file

@ -73,7 +73,7 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte
BOOL unprepare_header = FALSE; BOOL unprepare_header = FALSE;
MMRESULT res; MMRESULT res;
TRACE("(%p)->(%p,%ld)\n", This, data, size); TRACE("(%p)->(%p,%d)\n", This, data, size);
hr = IPin_ConnectionMediaType(This->tf.ppPins[0], &amt); hr = IPin_ConnectionMediaType(This->tf.ppPins[0], &amt);
if (FAILED(hr)) { if (FAILED(hr)) {
@ -98,7 +98,7 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte
hr = OutputPin_GetDeliveryBuffer((OutputPin*)This->tf.ppPins[1], &pSample, NULL, NULL, 0); hr = OutputPin_GetDeliveryBuffer((OutputPin*)This->tf.ppPins[1], &pSample, NULL, NULL, 0);
if (FAILED(hr)) { if (FAILED(hr)) {
ERR("Unable to get delivery buffer (%lx)\n", hr); ERR("Unable to get delivery buffer (%x)\n", hr);
goto error; goto error;
} }
@ -107,7 +107,7 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte
hr = IMediaSample_GetPointer(pSample, &pbDstStream); hr = IMediaSample_GetPointer(pSample, &pbDstStream);
if (FAILED(hr)) { if (FAILED(hr)) {
ERR("Unable to get pointer to buffer (%lx)\n", hr); ERR("Unable to get pointer to buffer (%x)\n", hr);
goto error; goto error;
} }
cbDstStream = IMediaSample_GetSize(pSample); cbDstStream = IMediaSample_GetSize(pSample);
@ -133,7 +133,7 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte
} }
This->reinit_codec = FALSE; This->reinit_codec = FALSE;
TRACE("used in %lu, used out %lu\n", ash.cbSrcLengthUsed, ash.cbDstLengthUsed); TRACE("used in %u, used out %u\n", ash.cbSrcLengthUsed, ash.cbDstLengthUsed);
hr = IMediaSample_SetActualDataLength(pSample, ash.cbDstLengthUsed); hr = IMediaSample_SetActualDataLength(pSample, ash.cbDstLengthUsed);
assert(hr == S_OK); assert(hr == S_OK);
@ -147,7 +147,7 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte
hr = OutputPin_SendSample((OutputPin*)This->tf.ppPins[1], pSample); hr = OutputPin_SendSample((OutputPin*)This->tf.ppPins[1], pSample);
if (hr != S_OK && hr != VFW_E_NOT_CONNECTED) { if (hr != S_OK && hr != VFW_E_NOT_CONNECTED) {
ERR("Error sending sample (%lx)\n", hr); ERR("Error sending sample (%x)\n", hr);
goto error; goto error;
} }
@ -202,7 +202,7 @@ static HRESULT ACMWrapper_ConnectInput(TransformFilterImpl* pTransformFilter, co
This->max_size = INPUT_BUFFER_SIZE; This->max_size = INPUT_BUFFER_SIZE;
} }
TRACE("input buffer size %ld\n", This->max_size); TRACE("input buffer size %d\n", This->max_size);
/* Update buffer size of media samples in output */ /* Update buffer size of media samples in output */
((OutputPin*)This->tf.ppPins[1])->allocProps.cbBuffer = OUTPUT_BUFFER_SIZE; ((OutputPin*)This->tf.ppPins[1])->allocProps.cbBuffer = OUTPUT_BUFFER_SIZE;

18
dlls/quartz/avidec.c
View file

@ -66,7 +66,7 @@ static HRESULT AVIDec_ProcessBegin(TransformFilterImpl* pTransformFilter)
result = ICDecompressBegin(This->hvid, This->pBihIn, This->pBihOut); result = ICDecompressBegin(This->hvid, This->pBihIn, This->pBihOut);
if (result != ICERR_OK) if (result != ICERR_OK)
{ {
ERR("Cannot start processing (%ld)\n", result); ERR("Cannot start processing (%d)\n", result);
return E_FAIL; return E_FAIL;
} }
return S_OK; return S_OK;
@ -83,7 +83,7 @@ static HRESULT AVIDec_ProcessSampleData(TransformFilterImpl* pTransformFilter, L
DWORD cbDstStream; DWORD cbDstStream;
LPBYTE pbDstStream; LPBYTE pbDstStream;
TRACE("(%p)->(%p,%ld)\n", This, data, size); TRACE("(%p)->(%p,%d)\n", This, data, size);
hr = IPin_ConnectionMediaType(This->tf.ppPins[0], &amt); hr = IPin_ConnectionMediaType(This->tf.ppPins[0], &amt);
if (FAILED(hr)) { if (FAILED(hr)) {
@ -97,7 +97,7 @@ static HRESULT AVIDec_ProcessSampleData(TransformFilterImpl* pTransformFilter, L
hr = OutputPin_GetDeliveryBuffer((OutputPin*)This->tf.ppPins[1], &pSample, NULL, NULL, 0); hr = OutputPin_GetDeliveryBuffer((OutputPin*)This->tf.ppPins[1], &pSample, NULL, NULL, 0);
if (FAILED(hr)) { if (FAILED(hr)) {
ERR("Unable to get delivery buffer (%lx)\n", hr); ERR("Unable to get delivery buffer (%x)\n", hr);
goto error; goto error;
} }
@ -106,23 +106,23 @@ static HRESULT AVIDec_ProcessSampleData(TransformFilterImpl* pTransformFilter, L
hr = IMediaSample_GetPointer(pSample, &pbDstStream); hr = IMediaSample_GetPointer(pSample, &pbDstStream);
if (FAILED(hr)) { if (FAILED(hr)) {
ERR("Unable to get pointer to buffer (%lx)\n", hr); ERR("Unable to get pointer to buffer (%x)\n", hr);
goto error; goto error;
} }
cbDstStream = IMediaSample_GetSize(pSample); cbDstStream = IMediaSample_GetSize(pSample);
if (cbDstStream < This->pBihOut->biSizeImage) { if (cbDstStream < This->pBihOut->biSizeImage) {
ERR("Sample size is too small %ld < %ld\n", cbDstStream, This->pBihOut->biSizeImage); ERR("Sample size is too small %d < %d\n", cbDstStream, This->pBihOut->biSizeImage);
hr = E_FAIL; hr = E_FAIL;
goto error; goto error;
} }
res = ICDecompress(This->hvid, 0, This->pBihIn, data, This->pBihOut, pbDstStream); res = ICDecompress(This->hvid, 0, This->pBihIn, data, This->pBihOut, pbDstStream);
if (res != ICERR_OK) if (res != ICERR_OK)
ERR("Error occurred during the decompression (%lx)\n", res); ERR("Error occurred during the decompression (%x)\n", res);
hr = OutputPin_SendSample((OutputPin*)This->tf.ppPins[1], pSample); hr = OutputPin_SendSample((OutputPin*)This->tf.ppPins[1], pSample);
if (hr != S_OK && hr != VFW_E_NOT_CONNECTED) { if (hr != S_OK && hr != VFW_E_NOT_CONNECTED) {
ERR("Error sending sample (%lx)\n", hr); ERR("Error sending sample (%x)\n", hr);
goto error; goto error;
} }
@ -143,7 +143,7 @@ static HRESULT AVIDec_ProcessEnd(TransformFilterImpl* pTransformFilter)
result = ICDecompressEnd(This->hvid); result = ICDecompressEnd(This->hvid);
if (result != ICERR_OK) if (result != ICERR_OK)
{ {
ERR("Cannot stop processing (%ld)\n", result); ERR("Cannot stop processing (%d)\n", result);
return E_FAIL; return E_FAIL;
} }
return S_OK; return S_OK;
@ -212,7 +212,7 @@ static HRESULT AVIDec_ConnectInput(TransformFilterImpl* pTransformFilter, const
result = ICDecompressQuery(This->hvid, This->pBihIn, This->pBihOut); result = ICDecompressQuery(This->hvid, This->pBihIn, This->pBihOut);
if (result != ICERR_OK) if (result != ICERR_OK)
{ {
TRACE("Unable to found a suitable output format (%ld)\n", result); TRACE("Unable to found a suitable output format (%d)\n", result);
goto failed; goto failed;
} }

16
dlls/quartz/avisplit.c
View file

@ -175,7 +175,7 @@ static HRESULT AVISplitter_Sample(LPVOID iface, IMediaSample * pSample)
FIXME("handle palette change\n"); FIXME("handle palette change\n");
break; break;
default: default:
FIXME("Skipping unknown chunk type: %s at file offset 0x%lx\n", debugstr_an((LPSTR)&This->CurrentChunk.fcc, 4), (DWORD)BYTES_FROM_MEDIATIME(This->CurrentChunkOffset)); FIXME("Skipping unknown chunk type: %s at file offset 0x%x\n", debugstr_an((LPSTR)&This->CurrentChunk.fcc, 4), (DWORD)BYTES_FROM_MEDIATIME(This->CurrentChunkOffset));
if (S_FALSE == AVISplitter_NextChunk(&This->CurrentChunkOffset, &This->CurrentChunk, &tStart, &tStop, pbSrcStream, FALSE)) if (S_FALSE == AVISplitter_NextChunk(&This->CurrentChunkOffset, &This->CurrentChunk, &tStart, &tStop, pbSrcStream, FALSE))
bMoreData = FALSE; bMoreData = FALSE;
continue; continue;
@ -187,7 +187,7 @@ static HRESULT AVISplitter_Sample(LPVOID iface, IMediaSample * pSample)
if (streamId > This->Parser.cStreams) if (streamId > This->Parser.cStreams)
{ {
ERR("Corrupted AVI file (contains stream id %d, but supposed to only have %ld streams)\n", streamId, This->Parser.cStreams); ERR("Corrupted AVI file (contains stream id %d, but supposed to only have %d streams)\n", streamId, This->Parser.cStreams);
hr = E_FAIL; hr = E_FAIL;
break; break;
} }
@ -207,7 +207,7 @@ static HRESULT AVISplitter_Sample(LPVOID iface, IMediaSample * pSample)
} }
else else
{ {
TRACE("Skipping sending sample for stream %02d due to error (%lx)\n", streamId, hr); TRACE("Skipping sending sample for stream %02d due to error (%x)\n", streamId, hr);
This->pCurrentSample = NULL; This->pCurrentSample = NULL;
if (S_FALSE == AVISplitter_NextChunk(&This->CurrentChunkOffset, &This->CurrentChunk, &tStart, &tStop, pbSrcStream, FALSE)) if (S_FALSE == AVISplitter_NextChunk(&This->CurrentChunkOffset, &This->CurrentChunk, &tStart, &tStop, pbSrcStream, FALSE))
bMoreData = FALSE; bMoreData = FALSE;
@ -227,7 +227,7 @@ static HRESULT AVISplitter_Sample(LPVOID iface, IMediaSample * pSample)
assert(chunk_remaining_bytes <= cbDstStream - IMediaSample_GetActualDataLength(This->pCurrentSample)); assert(chunk_remaining_bytes <= cbDstStream - IMediaSample_GetActualDataLength(This->pCurrentSample));
/* trace removed for performance reasons */ /* trace removed for performance reasons */
/* TRACE("chunk_remaining_bytes: 0x%lx, cbSrcStream: 0x%lx, offset_src: 0x%lx\n", chunk_remaining_bytes, cbSrcStream, offset_src); */ /* TRACE("chunk_remaining_bytes: 0x%x, cbSrcStream: 0x%x, offset_src: 0x%x\n", chunk_remaining_bytes, cbSrcStream, offset_src); */
} }
if (chunk_remaining_bytes <= cbSrcStream - offset_src) if (chunk_remaining_bytes <= cbSrcStream - offset_src)
@ -264,7 +264,7 @@ static HRESULT AVISplitter_Sample(LPVOID iface, IMediaSample * pSample)
hr = OutputPin_SendSample(&pOutputPin->pin, This->pCurrentSample); hr = OutputPin_SendSample(&pOutputPin->pin, This->pCurrentSample);
if (hr != S_OK && hr != VFW_E_NOT_CONNECTED) if (hr != S_OK && hr != VFW_E_NOT_CONNECTED)
ERR("Error sending sample (%lx)\n", hr); ERR("Error sending sample (%x)\n", hr);
} }
if (This->pCurrentSample) if (This->pCurrentSample)
@ -308,7 +308,7 @@ skip:
} }
if (FAILED(hr)) if (FAILED(hr))
{ {
ERR("%lx\n", hr); ERR("%x\n", hr);
break; break;
} }
} }
@ -455,8 +455,8 @@ static HRESULT AVISplitter_ProcessStreamList(AVISplitterImpl * This, const BYTE
dump_AM_MEDIA_TYPE(&amt); dump_AM_MEDIA_TYPE(&amt);
TRACE("fSamplesPerSec = %f\n", (double)fSamplesPerSec); TRACE("fSamplesPerSec = %f\n", (double)fSamplesPerSec);
TRACE("dwSampleSize = %lx\n", dwSampleSize); TRACE("dwSampleSize = %x\n", dwSampleSize);
TRACE("dwLength = %lx\n", dwLength); TRACE("dwLength = %x\n", dwLength);
hr = Parser_AddPin(&(This->Parser), &piOutput, &props, &amt, fSamplesPerSec, dwSampleSize, dwLength); hr = Parser_AddPin(&(This->Parser), &piOutput, &props, &amt, fSamplesPerSec, dwSampleSize, dwLength);

2
dlls/quartz/control.c
View file

@ -186,7 +186,7 @@ HRESULT WINAPI MediaSeekingImpl_SetPositions(IMediaSeeking * iface, LONGLONG * p
BOOL bChangeStart = FALSE, bChangeStop = FALSE; BOOL bChangeStart = FALSE, bChangeStop = FALSE;
LONGLONG llNewStart, llNewStop; LONGLONG llNewStart, llNewStop;
TRACE("(%p, %lx, %p, %lx)\n", pCurrent, dwCurrentFlags, pStop, dwStopFlags); TRACE("(%p, %x, %p, %x)\n", pCurrent, dwCurrentFlags, pStop, dwStopFlags);
llNewStart = Adjust(This->llStart, pCurrent, dwCurrentFlags); llNewStart = Adjust(This->llStart, pCurrent, dwCurrentFlags);
llNewStop = Adjust(This->llStop, pStop, dwStopFlags); llNewStop = Adjust(This->llStop, pStop, dwStopFlags);

36
dlls/quartz/dsoundrender.c
View file

@ -118,15 +118,15 @@ static HRESULT DSoundRender_CreateSoundBuffer(IBaseFilter * iface)
TRACE("MajorType %s\n", debugstr_guid(&amt.majortype)); TRACE("MajorType %s\n", debugstr_guid(&amt.majortype));
TRACE("SubType %s\n", debugstr_guid(&amt.subtype)); TRACE("SubType %s\n", debugstr_guid(&amt.subtype));
TRACE("Format %s\n", debugstr_guid(&amt.formattype)); TRACE("Format %s\n", debugstr_guid(&amt.formattype));
TRACE("Size %ld\n", amt.cbFormat); TRACE("Size %d\n", amt.cbFormat);
dump_AM_MEDIA_TYPE(&amt); dump_AM_MEDIA_TYPE(&amt);
format = (WAVEFORMATEX*)amt.pbFormat; format = (WAVEFORMATEX*)amt.pbFormat;
TRACE("wFormatTag = %x %x\n", format->wFormatTag, WAVE_FORMAT_PCM); TRACE("wFormatTag = %x %x\n", format->wFormatTag, WAVE_FORMAT_PCM);
TRACE("nChannels = %d\n", format->nChannels); TRACE("nChannels = %d\n", format->nChannels);
TRACE("nSamplesPerSec = %lu\n", format->nSamplesPerSec); TRACE("nSamplesPerSec = %u\n", format->nSamplesPerSec);
TRACE("nAvgBytesPerSec = %lu\n", format->nAvgBytesPerSec); TRACE("nAvgBytesPerSec = %u\n", format->nAvgBytesPerSec);
TRACE("nBlockAlign = %d\n", format->nBlockAlign); TRACE("nBlockAlign = %d\n", format->nBlockAlign);
TRACE("wBitsPerSample = %d\n", format->wBitsPerSample); TRACE("wBitsPerSample = %d\n", format->wBitsPerSample);
TRACE("cbSize = %d\n", format->cbSize); TRACE("cbSize = %d\n", format->cbSize);
@ -171,7 +171,7 @@ static HRESULT DSoundRender_SendSampleData(DSoundRenderImpl* This, LPBYTE data,
hr = IDirectSoundBuffer_GetCurrentPosition(This->dsbuffer, &play_pos, NULL); hr = IDirectSoundBuffer_GetCurrentPosition(This->dsbuffer, &play_pos, NULL);
if (hr != DS_OK) if (hr != DS_OK)
{ {
ERR("Error GetCurrentPosition: %lx\n", hr); ERR("Error GetCurrentPosition: %x\n", hr);
break; break;
} }
if (This->write_pos < play_pos) if (This->write_pos < play_pos)
@ -189,10 +189,10 @@ static HRESULT DSoundRender_SendSampleData(DSoundRenderImpl* This, LPBYTE data,
size2 = min(buf_free, size); size2 = min(buf_free, size);
hr = IDirectSoundBuffer_Lock(This->dsbuffer, This->write_pos, size2, &lpbuf1, &dwsize1, &lpbuf2, &dwsize2, 0); hr = IDirectSoundBuffer_Lock(This->dsbuffer, This->write_pos, size2, &lpbuf1, &dwsize1, &lpbuf2, &dwsize2, 0);
if (hr != DS_OK) { if (hr != DS_OK) {
ERR("Unable to lock sound buffer! (%lx)\n", hr); ERR("Unable to lock sound buffer! (%x)\n", hr);
break; break;
} }
/* TRACE("write_pos=%ld, size=%ld, sz1=%ld, sz2=%ld\n", This->write_pos, size2, dwsize1, dwsize2); */ /* TRACE("write_pos=%d, size=%d, sz1=%d, sz2=%d\n", This->write_pos, size2, dwsize1, dwsize2); */
memcpy(lpbuf1, data, dwsize1); memcpy(lpbuf1, data, dwsize1);
if (dwsize2) if (dwsize2)
@ -200,14 +200,14 @@ static HRESULT DSoundRender_SendSampleData(DSoundRenderImpl* This, LPBYTE data,
hr = IDirectSoundBuffer_Unlock(This->dsbuffer, lpbuf1, dwsize1, lpbuf2, dwsize2); hr = IDirectSoundBuffer_Unlock(This->dsbuffer, lpbuf1, dwsize1, lpbuf2, dwsize2);
if (hr != DS_OK) if (hr != DS_OK)
ERR("Unable to unlock sound buffer! (%lx)\n", hr); ERR("Unable to unlock sound buffer! (%x)\n", hr);
if (!This->started) if (!This->started)
{ {
hr = IDirectSoundBuffer_Play(This->dsbuffer, 0, 0, DSBPLAY_LOOPING); hr = IDirectSoundBuffer_Play(This->dsbuffer, 0, 0, DSBPLAY_LOOPING);
if (hr == DS_OK) if (hr == DS_OK)
This->started = TRUE; This->started = TRUE;
else else
ERR("Can't start playing! (%lx)\n", hr); ERR("Can't start playing! (%x)\n", hr);
} }
size -= dwsize1 + dwsize2; size -= dwsize1 + dwsize2;
data += dwsize1 + dwsize2; data += dwsize1 + dwsize2;
@ -234,13 +234,13 @@ static HRESULT DSoundRender_Sample(LPVOID iface, IMediaSample * pSample)
hr = IMediaSample_GetPointer(pSample, &pbSrcStream); hr = IMediaSample_GetPointer(pSample, &pbSrcStream);
if (FAILED(hr)) if (FAILED(hr))
{ {
ERR("Cannot get pointer to sample data (%lx)\n", hr); ERR("Cannot get pointer to sample data (%x)\n", hr);
return hr; return hr;
} }
hr = IMediaSample_GetTime(pSample, &tStart, &tStop); hr = IMediaSample_GetTime(pSample, &tStart, &tStop);
if (FAILED(hr)) if (FAILED(hr))
ERR("Cannot get sample time (%lx)\n", hr); ERR("Cannot get sample time (%x)\n", hr);
cbSrcStream = IMediaSample_GetActualDataLength(pSample); cbSrcStream = IMediaSample_GetActualDataLength(pSample);
@ -281,8 +281,8 @@ static HRESULT DSoundRender_QueryAccept(LPVOID iface, const AM_MEDIA_TYPE * pmt)
WAVEFORMATEX* format = (WAVEFORMATEX*)pmt->pbFormat; WAVEFORMATEX* format = (WAVEFORMATEX*)pmt->pbFormat;
TRACE("wFormatTag = %x %x\n", format->wFormatTag, WAVE_FORMAT_PCM); TRACE("wFormatTag = %x %x\n", format->wFormatTag, WAVE_FORMAT_PCM);
TRACE("nChannels = %d\n", format->nChannels); TRACE("nChannels = %d\n", format->nChannels);
TRACE("nSamplesPerSec = %ld\n", format->nAvgBytesPerSec); TRACE("nSamplesPerSec = %d\n", format->nAvgBytesPerSec);
TRACE("nAvgBytesPerSec = %ld\n", format->nAvgBytesPerSec); TRACE("nAvgBytesPerSec = %d\n", format->nAvgBytesPerSec);
TRACE("nBlockAlign = %d\n", format->nBlockAlign); TRACE("nBlockAlign = %d\n", format->nBlockAlign);
TRACE("wBitsPerSample = %d\n", format->wBitsPerSample); TRACE("wBitsPerSample = %d\n", format->wBitsPerSample);
@ -373,7 +373,7 @@ static ULONG WINAPI DSoundRender_AddRef(IBaseFilter * iface)
DSoundRenderImpl *This = (DSoundRenderImpl *)iface; DSoundRenderImpl *This = (DSoundRenderImpl *)iface;
ULONG refCount = InterlockedIncrement(&This->refCount); ULONG refCount = InterlockedIncrement(&This->refCount);
TRACE("(%p/%p)->() AddRef from %ld\n", This, iface, refCount - 1); TRACE("(%p/%p)->() AddRef from %d\n", This, iface, refCount - 1);
return refCount; return refCount;
} }
@ -383,7 +383,7 @@ static ULONG WINAPI DSoundRender_Release(IBaseFilter * iface)
DSoundRenderImpl *This = (DSoundRenderImpl *)iface; DSoundRenderImpl *This = (DSoundRenderImpl *)iface;
ULONG refCount = InterlockedDecrement(&This->refCount); ULONG refCount = InterlockedDecrement(&This->refCount);
TRACE("(%p/%p)->() Release from %ld\n", This, iface, refCount + 1); TRACE("(%p/%p)->() Release from %d\n", This, iface, refCount + 1);
if (!refCount) if (!refCount)
{ {
@ -473,7 +473,7 @@ static HRESULT WINAPI DSoundRender_GetState(IBaseFilter * iface, DWORD dwMilliSe
{ {
DSoundRenderImpl *This = (DSoundRenderImpl *)iface; DSoundRenderImpl *This = (DSoundRenderImpl *)iface;
TRACE("(%p/%p)->(%ld, %p)\n", This, iface, dwMilliSecsTimeout, pState); TRACE("(%p/%p)->(%d, %p)\n", This, iface, dwMilliSecsTimeout, pState);
EnterCriticalSection(&This->csFilter); EnterCriticalSection(&This->csFilter);
{ {
@ -703,7 +703,7 @@ static HRESULT WINAPI Basicaudio_GetTypeInfo(IBasicAudio *iface,
ITypeInfo**ppTInfo) { ITypeInfo**ppTInfo) {
ICOM_THIS_MULTI(DSoundRenderImpl, IBasicAudio_vtbl, iface); ICOM_THIS_MULTI(DSoundRenderImpl, IBasicAudio_vtbl, iface);
TRACE("(%p/%p)->(%d, %ld, %p): stub !!!\n", This, iface, iTInfo, lcid, ppTInfo); TRACE("(%p/%p)->(%d, %d, %p): stub !!!\n", This, iface, iTInfo, lcid, ppTInfo);
return S_OK; return S_OK;
} }
@ -716,7 +716,7 @@ static HRESULT WINAPI Basicaudio_GetIDsOfNames(IBasicAudio *iface,
DISPID*rgDispId) { DISPID*rgDispId) {
ICOM_THIS_MULTI(DSoundRenderImpl, IBasicAudio_vtbl, iface); ICOM_THIS_MULTI(DSoundRenderImpl, IBasicAudio_vtbl, iface);
TRACE("(%p/%p)->(%s (%p), %p, %d, %ld, %p): stub !!!\n", This, iface, debugstr_guid(riid), riid, rgszNames, cNames, lcid, rgDispId); TRACE("(%p/%p)->(%s (%p), %p, %d, %d, %p): stub !!!\n", This, iface, debugstr_guid(riid), riid, rgszNames, cNames, lcid, rgDispId);
return S_OK; return S_OK;
} }
@ -732,7 +732,7 @@ static HRESULT WINAPI Basicaudio_Invoke(IBasicAudio *iface,
UINT*puArgErr) { UINT*puArgErr) {
ICOM_THIS_MULTI(DSoundRenderImpl, IBasicAudio_vtbl, iface); ICOM_THIS_MULTI(DSoundRenderImpl, IBasicAudio_vtbl, iface);
TRACE("(%p/%p)->(%ld, %s (%p), %ld, %04x, %p, %p, %p, %p): stub !!!\n", This, iface, dispIdMember, debugstr_guid(riid), riid, lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr); TRACE("(%p/%p)->(%d, %s (%p), %d, %04x, %p, %p, %p, %p): stub !!!\n", This, iface, dispIdMember, debugstr_guid(riid), riid, lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr);
return S_OK; return S_OK;
} }

6
dlls/quartz/enumfilters.c
View file

@ -41,7 +41,7 @@ HRESULT IEnumFiltersImpl_Construct(IBaseFilter ** ppFilters, ULONG nFilters, IEn
* they should have been previously AddRef'd. */ * they should have been previously AddRef'd. */
IEnumFiltersImpl * pEnumFilters = CoTaskMemAlloc(sizeof(IEnumFiltersImpl)); IEnumFiltersImpl * pEnumFilters = CoTaskMemAlloc(sizeof(IEnumFiltersImpl));
TRACE("(%p, %ld, %p)\n", ppFilters, nFilters, ppEnum); TRACE("(%p, %d, %p)\n", ppFilters, nFilters, ppEnum);
*ppEnum = NULL; *ppEnum = NULL;
@ -124,7 +124,7 @@ static HRESULT WINAPI IEnumFiltersImpl_Next(IEnumFilters * iface, ULONG cFilters
cFetched = min(This->nFilters, This->uIndex + cFilters) - This->uIndex; cFetched = min(This->nFilters, This->uIndex + cFilters) - This->uIndex;
TRACE("(%p)->(%lu, %p, %p)\n", iface, cFilters, ppFilters, pcFetched); TRACE("(%p)->(%u, %p, %p)\n", iface, cFilters, ppFilters, pcFetched);
for (i = 0; i < cFetched; i++) for (i = 0; i < cFetched; i++)
{ {
@ -146,7 +146,7 @@ static HRESULT WINAPI IEnumFiltersImpl_Skip(IEnumFilters * iface, ULONG cFilters
{ {
IEnumFiltersImpl *This = (IEnumFiltersImpl *)iface; IEnumFiltersImpl *This = (IEnumFiltersImpl *)iface;
TRACE("(%p)->(%lu)\n", iface, cFilters); TRACE("(%p)->(%u)\n", iface, cFilters);
if (This->uIndex + cFilters < This->nFilters) if (This->uIndex + cFilters < This->nFilters)
{ {

10
dlls/quartz/enummedia.c
View file

@ -154,7 +154,7 @@ static ULONG WINAPI IEnumMediaTypesImpl_AddRef(IEnumMediaTypes * iface)
IEnumMediaTypesImpl *This = (IEnumMediaTypesImpl *)iface; IEnumMediaTypesImpl *This = (IEnumMediaTypesImpl *)iface;
ULONG refCount = InterlockedIncrement(&This->refCount); ULONG refCount = InterlockedIncrement(&This->refCount);
TRACE("(%p)->() AddRef from %ld\n", iface, refCount - 1); TRACE("(%p)->() AddRef from %d\n", iface, refCount - 1);
return refCount; return refCount;
} }
@ -164,7 +164,7 @@ static ULONG WINAPI IEnumMediaTypesImpl_Release(IEnumMediaTypes * iface)
IEnumMediaTypesImpl *This = (IEnumMediaTypesImpl *)iface; IEnumMediaTypesImpl *This = (IEnumMediaTypesImpl *)iface;
ULONG refCount = InterlockedDecrement(&This->refCount); ULONG refCount = InterlockedDecrement(&This->refCount);
TRACE("(%p)->() Release from %ld\n", iface, refCount + 1); TRACE("(%p)->() Release from %d\n", iface, refCount + 1);
if (!refCount) if (!refCount)
{ {
@ -185,8 +185,8 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Next(IEnumMediaTypes * iface, ULONG cM
cFetched = min(This->enumMediaDetails.cMediaTypes, This->uIndex + cMediaTypes) - This->uIndex; cFetched = min(This->enumMediaDetails.cMediaTypes, This->uIndex + cMediaTypes) - This->uIndex;
TRACE("(%lu, %p, %p)\n", cMediaTypes, ppMediaTypes, pcFetched); TRACE("(%u, %p, %p)\n", cMediaTypes, ppMediaTypes, pcFetched);
TRACE("Next uIndex: %lu, cFetched: %lu\n", This->uIndex, cFetched); TRACE("Next uIndex: %u, cFetched: %u\n", This->uIndex, cFetched);
if (cFetched > 0) if (cFetched > 0)
{ {
@ -215,7 +215,7 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Skip(IEnumMediaTypes * iface, ULONG cM
{ {
IEnumMediaTypesImpl *This = (IEnumMediaTypesImpl *)iface; IEnumMediaTypesImpl *This = (IEnumMediaTypesImpl *)iface;
TRACE("(%lu)\n", cMediaTypes); TRACE("(%u)\n", cMediaTypes);
if (This->uIndex + cMediaTypes < This->enumMediaDetails.cMediaTypes) if (This->uIndex + cMediaTypes < This->enumMediaDetails.cMediaTypes)
{ {

12
dlls/quartz/enummoniker.c
View file

@ -50,7 +50,7 @@ HRESULT EnumMonikerImpl_Create(IMoniker ** ppMoniker, ULONG nMonikerCount, IEnum
* IMonikers */ * IMonikers */
EnumMonikerImpl * pemi = CoTaskMemAlloc(sizeof(EnumMonikerImpl)); EnumMonikerImpl * pemi = CoTaskMemAlloc(sizeof(EnumMonikerImpl));
TRACE("(%p, %ld, %p)\n", ppMoniker, nMonikerCount, ppEnum); TRACE("(%p, %d, %p)\n", ppMoniker, nMonikerCount, ppEnum);
*ppEnum = NULL; *ppEnum = NULL;
@ -106,7 +106,7 @@ static ULONG WINAPI EnumMonikerImpl_AddRef(LPENUMMONIKER iface)
ref = InterlockedIncrement(&This->ref); ref = InterlockedIncrement(&This->ref);
TRACE("(%p)->() AddRef from %ld\n", iface, ref - 1); TRACE("(%p)->() AddRef from %d\n", iface, ref - 1);
return ref; return ref;
} }
@ -119,7 +119,7 @@ static ULONG WINAPI EnumMonikerImpl_Release(LPENUMMONIKER iface)
EnumMonikerImpl *This = (EnumMonikerImpl *)iface; EnumMonikerImpl *This = (EnumMonikerImpl *)iface;
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p)->() Release from %ld\n", iface, ref + 1); TRACE("(%p)->() Release from %d\n", iface, ref + 1);
if (!ref) if (!ref)
{ {
@ -136,7 +136,7 @@ static HRESULT WINAPI EnumMonikerImpl_Next(LPENUMMONIKER iface, ULONG celt, IMon
ULONG fetched; ULONG fetched;
EnumMonikerImpl *This = (EnumMonikerImpl *)iface; EnumMonikerImpl *This = (EnumMonikerImpl *)iface;
TRACE("(%p)->(%ld, %p, %p)\n", iface, celt, rgelt, pceltFetched); TRACE("(%p)->(%d, %p, %p)\n", iface, celt, rgelt, pceltFetched);
for (fetched = 0; (This->index + fetched < This->nMonikerCount) && (fetched < celt); fetched++) for (fetched = 0; (This->index + fetched < This->nMonikerCount) && (fetched < celt); fetched++)
{ {
@ -146,7 +146,7 @@ static HRESULT WINAPI EnumMonikerImpl_Next(LPENUMMONIKER iface, ULONG celt, IMon
This->index += fetched; This->index += fetched;
TRACE("-- fetched %ld\n", fetched); TRACE("-- fetched %d\n", fetched);
if (pceltFetched) if (pceltFetched)
*pceltFetched = fetched; *pceltFetched = fetched;
@ -161,7 +161,7 @@ static HRESULT WINAPI EnumMonikerImpl_Skip(LPENUMMONIKER iface, ULONG celt)
{ {
EnumMonikerImpl *This = (EnumMonikerImpl *)iface; EnumMonikerImpl *This = (EnumMonikerImpl *)iface;
TRACE("(%p)->(%ld)\n", iface, celt); TRACE("(%p)->(%d)\n", iface, celt);
This->index += celt; This->index += celt;

4
dlls/quartz/enumpins.c
View file

@ -105,7 +105,7 @@ static HRESULT WINAPI IEnumPinsImpl_Next(IEnumPins * iface, ULONG cPins, IPin **
cFetched = min(This->enumPinDetails.cPins, This->uIndex + cPins) - This->uIndex; cFetched = min(This->enumPinDetails.cPins, This->uIndex + cPins) - This->uIndex;
TRACE("(%lu, %p, %p)\n", cPins, ppPins, pcFetched); TRACE("(%u, %p, %p)\n", cPins, ppPins, pcFetched);
if (cFetched > 0) if (cFetched > 0)
{ {
@ -130,7 +130,7 @@ static HRESULT WINAPI IEnumPinsImpl_Skip(IEnumPins * iface, ULONG cPins)
{ {
IEnumPinsImpl *This = (IEnumPinsImpl *)iface; IEnumPinsImpl *This = (IEnumPinsImpl *)iface;
TRACE("(%lu)\n", cPins); TRACE("(%u)\n", cPins);
if (This->uIndex + cPins < This->enumPinDetails.cPins) if (This->uIndex + cPins < This->enumPinDetails.cPins)
{ {

6
dlls/quartz/enumregfilters.c
View file

@ -43,7 +43,7 @@ HRESULT IEnumRegFiltersImpl_Construct(REGFILTER* pInRegFilters, const ULONG size
REGFILTER* pRegFilters = NULL; REGFILTER* pRegFilters = NULL;
unsigned int i; unsigned int i;
TRACE("(%p, %ld, %p)\n", pInRegFilters, size, ppEnum); TRACE("(%p, %d, %p)\n", pInRegFilters, size, ppEnum);
pEnumRegFilters = CoTaskMemAlloc(sizeof(IEnumRegFiltersImpl)); pEnumRegFilters = CoTaskMemAlloc(sizeof(IEnumRegFiltersImpl));
if (!pEnumRegFilters) if (!pEnumRegFilters)
@ -145,7 +145,7 @@ static HRESULT WINAPI IEnumRegFiltersImpl_Next(IEnumRegFilters * iface, ULONG cF
cFetched = min(This->size, This->uIndex + cFilters) - This->uIndex; cFetched = min(This->size, This->uIndex + cFilters) - This->uIndex;
TRACE("(%p)->(%lu, %p, %p)\n", iface, cFilters, ppRegFilter, pcFetched); TRACE("(%p)->(%u, %p, %p)\n", iface, cFilters, ppRegFilter, pcFetched);
if (cFetched > 0) if (cFetched > 0)
{ {
@ -178,7 +178,7 @@ static HRESULT WINAPI IEnumRegFiltersImpl_Next(IEnumRegFilters * iface, ULONG cF
static HRESULT WINAPI IEnumRegFiltersImpl_Skip(IEnumRegFilters * iface, ULONG n) static HRESULT WINAPI IEnumRegFiltersImpl_Skip(IEnumRegFilters * iface, ULONG n)
{ {
TRACE("(%p)->(%lu)\n", iface, n); TRACE("(%p)->(%u)\n", iface, n);
return E_NOTIMPL; return E_NOTIMPL;
} }

28
dlls/quartz/filesource.c
View file

@ -362,7 +362,7 @@ static ULONG WINAPI AsyncReader_AddRef(IBaseFilter * iface)
AsyncReader *This = (AsyncReader *)iface; AsyncReader *This = (AsyncReader *)iface;
ULONG refCount = InterlockedIncrement(&This->refCount); ULONG refCount = InterlockedIncrement(&This->refCount);
TRACE("(%p/%p)->() AddRef from %ld\n", This, iface, refCount - 1); TRACE("(%p/%p)->() AddRef from %d\n", This, iface, refCount - 1);
return refCount; return refCount;
} }
@ -372,7 +372,7 @@ static ULONG WINAPI AsyncReader_Release(IBaseFilter * iface)
AsyncReader *This = (AsyncReader *)iface; AsyncReader *This = (AsyncReader *)iface;
ULONG refCount = InterlockedDecrement(&This->refCount); ULONG refCount = InterlockedDecrement(&This->refCount);
TRACE("(%p/%p)->() Release from %ld\n", This, iface, refCount + 1); TRACE("(%p/%p)->() Release from %d\n", This, iface, refCount + 1);
if (!refCount) if (!refCount)
{ {
@ -426,7 +426,7 @@ static HRESULT WINAPI AsyncReader_Run(IBaseFilter * iface, REFERENCE_TIME tStart
{ {
AsyncReader *This = (AsyncReader *)iface; AsyncReader *This = (AsyncReader *)iface;
TRACE("(%lx%08lx)\n", (ULONG)(tStart >> 32), (ULONG)tStart); TRACE("(%x%08x)\n", (ULONG)(tStart >> 32), (ULONG)tStart);
This->state = State_Running; This->state = State_Running;
@ -437,7 +437,7 @@ static HRESULT WINAPI AsyncReader_GetState(IBaseFilter * iface, DWORD dwMilliSec
{ {
AsyncReader *This = (AsyncReader *)iface; AsyncReader *This = (AsyncReader *)iface;
TRACE("(%lu, %p)\n", dwMilliSecsTimeout, pState); TRACE("(%u, %p)\n", dwMilliSecsTimeout, pState);
*pState = This->state; *pState = This->state;
@ -828,7 +828,7 @@ static HRESULT FileAsyncReaderPin_ConnectSpecific(IPin * iface, IPin * pReceiveP
FreeMediaType(&This->pin.mtCurrent); FreeMediaType(&This->pin.mtCurrent);
} }
TRACE(" -- %lx\n", hr); TRACE(" -- %x\n", hr);
return hr; return hr;
} }
@ -908,7 +908,7 @@ static HRESULT WINAPI FileAsyncReader_RequestAllocator(IAsyncReader * iface, IMe
{ {
IMemAllocator_AddRef(pPreferred); IMemAllocator_AddRef(pPreferred);
*ppActual = pPreferred; *ppActual = pPreferred;
TRACE("FileAsyncReader_RequestAllocator -- %lx\n", hr); TRACE("FileAsyncReader_RequestAllocator -- %x\n", hr);
return S_OK; return S_OK;
} }
} }
@ -926,7 +926,7 @@ static HRESULT WINAPI FileAsyncReader_RequestAllocator(IAsyncReader * iface, IMe
{ {
IMemAllocator_AddRef(pPreferred); IMemAllocator_AddRef(pPreferred);
*ppActual = pPreferred; *ppActual = pPreferred;
TRACE("FileAsyncReader_RequestAllocator -- %lx\n", hr); TRACE("FileAsyncReader_RequestAllocator -- %x\n", hr);
return S_OK; return S_OK;
} }
} }
@ -938,7 +938,7 @@ static HRESULT WINAPI FileAsyncReader_RequestAllocator(IAsyncReader * iface, IMe
IMemAllocator_Release(pPreferred); IMemAllocator_Release(pPreferred);
} }
TRACE("-- %lx\n", hr); TRACE("-- %x\n", hr);
return hr; return hr;
} }
@ -1021,7 +1021,7 @@ static HRESULT WINAPI FileAsyncReader_Request(IAsyncReader * iface, IMediaSample
CoTaskMemFree(pDataRq); CoTaskMemFree(pDataRq);
} }
TRACE("-- %lx\n", hr); TRACE("-- %x\n", hr);
return hr; return hr;
} }
@ -1031,7 +1031,7 @@ static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader * iface, DWORD dw
DATAREQUEST * pDataRq = NULL; DATAREQUEST * pDataRq = NULL;
FileAsyncReader *This = impl_from_IAsyncReader(iface); FileAsyncReader *This = impl_from_IAsyncReader(iface);
TRACE("(%lu, %p, %p)\n", dwTimeout, ppSample, pdwUser); TRACE("(%u, %p, %p)\n", dwTimeout, ppSample, pdwUser);
/* FIXME: we could do with improving this by waiting for an array of event handles /* FIXME: we could do with improving this by waiting for an array of event handles
* and then determining which one finished and removing that from the list, otherwise * and then determining which one finished and removing that from the list, otherwise
@ -1081,7 +1081,7 @@ static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader * iface, DWORD dw
/* no need to close event handle since we will close it when the pin is destroyed */ /* no need to close event handle since we will close it when the pin is destroyed */
CoTaskMemFree(pDataRq); CoTaskMemFree(pDataRq);
TRACE("-- %lx\n", hr); TRACE("-- %x\n", hr);
return hr; return hr;
} }
@ -1107,7 +1107,7 @@ static HRESULT WINAPI FileAsyncReader_SyncReadAligned(IAsyncReader * iface, IMed
(LONG) BYTES_FROM_MEDIATIME(tStop - tStart), (LONG) BYTES_FROM_MEDIATIME(tStop - tStart),
pBuffer); pBuffer);
TRACE("-- %lx\n", hr); TRACE("-- %x\n", hr);
return hr; return hr;
} }
@ -1117,7 +1117,7 @@ static HRESULT WINAPI FileAsyncReader_SyncRead(IAsyncReader * iface, LONGLONG ll
HRESULT hr = S_OK; HRESULT hr = S_OK;
FileAsyncReader *This = impl_from_IAsyncReader(iface); FileAsyncReader *This = impl_from_IAsyncReader(iface);
TRACE("(%lx%08lx, %ld, %p)\n", (ULONG)(llPosition >> 32), (ULONG)llPosition, lLength, pBuffer); TRACE("(%x%08x, %d, %p)\n", (ULONG)(llPosition >> 32), (ULONG)llPosition, lLength, pBuffer);
ZeroMemory(&ovl, sizeof(ovl)); ZeroMemory(&ovl, sizeof(ovl));
@ -1142,7 +1142,7 @@ static HRESULT WINAPI FileAsyncReader_SyncRead(IAsyncReader * iface, LONGLONG ll
CloseHandle(ovl.hEvent); CloseHandle(ovl.hEvent);
TRACE("-- %lx\n", hr); TRACE("-- %x\n", hr);
return hr; return hr;
} }

144
dlls/quartz/filtergraph.c
View file

@ -246,7 +246,7 @@ static HRESULT Filtergraph_QueryInterface(IFilterGraphImpl *This,
static ULONG Filtergraph_AddRef(IFilterGraphImpl *This) { static ULONG Filtergraph_AddRef(IFilterGraphImpl *This) {
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p)->(): new ref = %ld\n", This, ref); TRACE("(%p)->(): new ref = %d\n", This, ref);
return ref; return ref;
} }
@ -254,7 +254,7 @@ static ULONG Filtergraph_AddRef(IFilterGraphImpl *This) {
static ULONG Filtergraph_Release(IFilterGraphImpl *This) { static ULONG Filtergraph_Release(IFilterGraphImpl *This) {
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p)->(): new ref = %ld\n", This, ref); TRACE("(%p)->(): new ref = %d\n", This, ref);
if (ref == 0) { if (ref == 0) {
int i; int i;
@ -524,7 +524,7 @@ static HRESULT WINAPI GraphBuilder_Reconnect(IGraphBuilder *iface,
IPin_QueryDirection(ppin, &pindir); IPin_QueryDirection(ppin, &pindir);
hr = IPin_ConnectedTo(ppin, &pConnectedTo); hr = IPin_ConnectedTo(ppin, &pConnectedTo);
if (FAILED(hr)) { if (FAILED(hr)) {
TRACE("Querying connected to failed: %lx\n", hr); TRACE("Querying connected to failed: %x\n", hr);
return hr; return hr;
} }
IPin_Disconnect(ppin); IPin_Disconnect(ppin);
@ -536,7 +536,7 @@ static HRESULT WINAPI GraphBuilder_Reconnect(IGraphBuilder *iface,
IPin_Release(pConnectedTo); IPin_Release(pConnectedTo);
if (FAILED(hr)) if (FAILED(hr))
ERR("Reconnecting pins failed, pins are not connected now..\n"); ERR("Reconnecting pins failed, pins are not connected now..\n");
TRACE("(%p->%p) -- %p %p -> %lx\n", iface, This, ppin, pConnectedTo, hr); TRACE("(%p->%p) -- %p %p -> %x\n", iface, This, ppin, pConnectedTo, hr);
return hr; return hr;
} }
@ -600,7 +600,7 @@ static HRESULT GetInternalConnections(IBaseFilter* pfilter, IPin* pinputpin, IPi
*pppins = CoTaskMemAlloc(sizeof(IPin*)*nb); *pppins = CoTaskMemAlloc(sizeof(IPin*)*nb);
hr = IPin_QueryInternalConnections(pinputpin, *pppins, &nb); hr = IPin_QueryInternalConnections(pinputpin, *pppins, &nb);
if (hr != S_OK) { if (hr != S_OK) {
ERR("Error (%lx)\n", hr); ERR("Error (%x)\n", hr);
} }
} else if (hr == E_NOTIMPL) { } else if (hr == E_NOTIMPL) {
/* Input connected to all outputs */ /* Input connected to all outputs */
@ -610,7 +610,7 @@ static HRESULT GetInternalConnections(IBaseFilter* pfilter, IPin* pinputpin, IPi
TRACE("E_NOTIMPL\n"); TRACE("E_NOTIMPL\n");
hr = IBaseFilter_EnumPins(pfilter, &penumpins); hr = IBaseFilter_EnumPins(pfilter, &penumpins);
if (FAILED(hr)) { if (FAILED(hr)) {
ERR("filter Enumpins failed (%lx)\n", hr); ERR("filter Enumpins failed (%x)\n", hr);
return hr; return hr;
} }
i = 0; i = 0;
@ -636,12 +636,12 @@ static HRESULT GetInternalConnections(IBaseFilter* pfilter, IPin* pinputpin, IPi
} }
nb = i; nb = i;
if (FAILED(hr)) { if (FAILED(hr)) {
ERR("Next failed (%lx)\n", hr); ERR("Next failed (%x)\n", hr);
return hr; return hr;
} }
IEnumPins_Release(penumpins); IEnumPins_Release(penumpins);
} else if (FAILED(hr)) { } else if (FAILED(hr)) {
ERR("Cannot get internal connection (%lx)\n", hr); ERR("Cannot get internal connection (%x)\n", hr);
return hr; return hr;
} }
@ -707,13 +707,13 @@ static HRESULT WINAPI GraphBuilder_Connect(IGraphBuilder *iface,
* filter to the minor mediatype of input pin of the renderer */ * filter to the minor mediatype of input pin of the renderer */
hr = IPin_EnumMediaTypes(ppinOut, &penummt); hr = IPin_EnumMediaTypes(ppinOut, &penummt);
if (FAILED(hr)) { if (FAILED(hr)) {
ERR("EnumMediaTypes (%lx)\n", hr); ERR("EnumMediaTypes (%x)\n", hr);
return hr; return hr;
} }
hr = IEnumMediaTypes_Next(penummt, 1, &mt, &nbmt); hr = IEnumMediaTypes_Next(penummt, 1, &mt, &nbmt);
if (FAILED(hr)) { if (FAILED(hr)) {
ERR("IEnumMediaTypes_Next (%lx)\n", hr); ERR("IEnumMediaTypes_Next (%x)\n", hr);
return hr; return hr;
} }
@ -729,7 +729,7 @@ static HRESULT WINAPI GraphBuilder_Connect(IGraphBuilder *iface,
tab[1] = mt->subtype; tab[1] = mt->subtype;
hr = IFilterMapper2_EnumMatchingFilters(This->pFilterMapper2, &pEnumMoniker, 0, FALSE, 0, TRUE, 1, tab, NULL, NULL, FALSE, FALSE, 0, NULL, NULL, NULL); hr = IFilterMapper2_EnumMatchingFilters(This->pFilterMapper2, &pEnumMoniker, 0, FALSE, 0, TRUE, 1, tab, NULL, NULL, FALSE, FALSE, 0, NULL, NULL, NULL);
if (FAILED(hr)) { if (FAILED(hr)) {
ERR("Unable to enum filters (%lx)\n", hr); ERR("Unable to enum filters (%x)\n", hr);
return hr; return hr;
} }
@ -744,7 +744,7 @@ static HRESULT WINAPI GraphBuilder_Connect(IGraphBuilder *iface,
hr = GetFilterInfo(pMoniker, &clsid, &var); hr = GetFilterInfo(pMoniker, &clsid, &var);
IMoniker_Release(pMoniker); IMoniker_Release(pMoniker);
if (FAILED(hr)) { if (FAILED(hr)) {
ERR("Unable to retrieve filter info (%lx)\n", hr); ERR("Unable to retrieve filter info (%x)\n", hr);
goto error; goto error;
} }
@ -755,13 +755,13 @@ static HRESULT WINAPI GraphBuilder_Connect(IGraphBuilder *iface,
hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)&pfilter); hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)&pfilter);
if (FAILED(hr)) { if (FAILED(hr)) {
ERR("Unable to create filter (%lx), trying next one\n", hr); ERR("Unable to create filter (%x), trying next one\n", hr);
goto error; goto error;
} }
hr = IGraphBuilder_AddFilter(iface, pfilter, NULL); hr = IGraphBuilder_AddFilter(iface, pfilter, NULL);
if (FAILED(hr)) { if (FAILED(hr)) {
ERR("Unable to add filter (%lx)\n", hr); ERR("Unable to add filter (%x)\n", hr);
IBaseFilter_Release(pfilter); IBaseFilter_Release(pfilter);
pfilter = NULL; pfilter = NULL;
goto error; goto error;
@ -769,13 +769,13 @@ static HRESULT WINAPI GraphBuilder_Connect(IGraphBuilder *iface,
hr = IBaseFilter_EnumPins(pfilter, &penumpins); hr = IBaseFilter_EnumPins(pfilter, &penumpins);
if (FAILED(hr)) { if (FAILED(hr)) {
ERR("Enumpins (%lx)\n", hr); ERR("Enumpins (%x)\n", hr);
goto error; goto error;
} }
hr = IEnumPins_Next(penumpins, 1, &ppinfilter, &pin); hr = IEnumPins_Next(penumpins, 1, &ppinfilter, &pin);
if (FAILED(hr)) { if (FAILED(hr)) {
ERR("Next (%lx)\n", hr); ERR("Next (%x)\n", hr);
goto error; goto error;
} }
if (pin == 0) { if (pin == 0) {
@ -786,7 +786,7 @@ static HRESULT WINAPI GraphBuilder_Connect(IGraphBuilder *iface,
hr = IPin_Connect(ppinOut, ppinfilter, NULL); hr = IPin_Connect(ppinOut, ppinfilter, NULL);
if (FAILED(hr)) { if (FAILED(hr)) {
TRACE("Cannot connect to filter (%lx), trying next one\n", hr); TRACE("Cannot connect to filter (%x), trying next one\n", hr);
goto error; goto error;
} }
TRACE("Successfully connected to filter, follow chain...\n"); TRACE("Successfully connected to filter, follow chain...\n");
@ -796,12 +796,12 @@ static HRESULT WINAPI GraphBuilder_Connect(IGraphBuilder *iface,
if (SUCCEEDED(hr)) { if (SUCCEEDED(hr)) {
int i; int i;
TRACE("pins to consider: %ld\n", nb); TRACE("pins to consider: %d\n", nb);
for(i = 0; i < nb; i++) { for(i = 0; i < nb; i++) {
TRACE("Processing pin %d\n", i); TRACE("Processing pin %d\n", i);
hr = IGraphBuilder_Connect(iface, ppins[i], ppinIn); hr = IGraphBuilder_Connect(iface, ppins[i], ppinIn);
if (FAILED(hr)) { if (FAILED(hr)) {
TRACE("Cannot render pin %p (%lx)\n", ppinfilter, hr); TRACE("Cannot render pin %p (%x)\n", ppinfilter, hr);
} }
IPin_Release(ppins[i]); IPin_Release(ppins[i]);
if (SUCCEEDED(hr)) break; if (SUCCEEDED(hr)) break;
@ -856,7 +856,7 @@ static HRESULT WINAPI GraphBuilder_Render(IGraphBuilder *iface,
hr = IPin_EnumMediaTypes(ppinOut, &penummt); hr = IPin_EnumMediaTypes(ppinOut, &penummt);
if (FAILED(hr)) { if (FAILED(hr)) {
ERR("EnumMediaTypes (%lx)\n", hr); ERR("EnumMediaTypes (%x)\n", hr);
return hr; return hr;
} }
@ -864,7 +864,7 @@ static HRESULT WINAPI GraphBuilder_Render(IGraphBuilder *iface,
{ {
hr = IEnumMediaTypes_Next(penummt, 1, &mt, &nbmt); hr = IEnumMediaTypes_Next(penummt, 1, &mt, &nbmt);
if (FAILED(hr)) { if (FAILED(hr)) {
ERR("IEnumMediaTypes_Next (%lx)\n", hr); ERR("IEnumMediaTypes_Next (%x)\n", hr);
return hr; return hr;
} }
if (!nbmt) if (!nbmt)
@ -877,7 +877,7 @@ static HRESULT WINAPI GraphBuilder_Render(IGraphBuilder *iface,
tab[1] = GUID_NULL; tab[1] = GUID_NULL;
hr = IFilterMapper2_EnumMatchingFilters(This->pFilterMapper2, &pEnumMoniker, 0, FALSE, 0, TRUE, 1, tab, NULL, NULL, TRUE, FALSE, 0, NULL, NULL, NULL); hr = IFilterMapper2_EnumMatchingFilters(This->pFilterMapper2, &pEnumMoniker, 0, FALSE, 0, TRUE, 1, tab, NULL, NULL, TRUE, FALSE, 0, NULL, NULL, NULL);
if (FAILED(hr)) { if (FAILED(hr)) {
ERR("Unable to enum filters (%lx)\n", hr); ERR("Unable to enum filters (%x)\n", hr);
return hr; return hr;
} }
@ -893,31 +893,31 @@ static HRESULT WINAPI GraphBuilder_Render(IGraphBuilder *iface,
hr = GetFilterInfo(pMoniker, &clsid, &var); hr = GetFilterInfo(pMoniker, &clsid, &var);
IMoniker_Release(pMoniker); IMoniker_Release(pMoniker);
if (FAILED(hr)) { if (FAILED(hr)) {
ERR("Unable to retrieve filter info (%lx)\n", hr); ERR("Unable to retrieve filter info (%x)\n", hr);
goto error; goto error;
} }
hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)&pfilter); hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)&pfilter);
if (FAILED(hr)) { if (FAILED(hr)) {
ERR("Unable to create filter (%lx), trying next one\n", hr); ERR("Unable to create filter (%x), trying next one\n", hr);
goto error; goto error;
} }
hr = IGraphBuilder_AddFilter(iface, pfilter, NULL); hr = IGraphBuilder_AddFilter(iface, pfilter, NULL);
if (FAILED(hr)) { if (FAILED(hr)) {
ERR("Unable to add filter (%lx)\n", hr); ERR("Unable to add filter (%x)\n", hr);
pfilter = NULL; pfilter = NULL;
goto error; goto error;
} }
hr = IBaseFilter_EnumPins(pfilter, &penumpins); hr = IBaseFilter_EnumPins(pfilter, &penumpins);
if (FAILED(hr)) { if (FAILED(hr)) {
ERR("Splitter Enumpins (%lx)\n", hr); ERR("Splitter Enumpins (%x)\n", hr);
goto error; goto error;
} }
hr = IEnumPins_Next(penumpins, 1, &ppinfilter, &pin); hr = IEnumPins_Next(penumpins, 1, &ppinfilter, &pin);
if (FAILED(hr)) { if (FAILED(hr)) {
ERR("Next (%lx)\n", hr); ERR("Next (%x)\n", hr);
goto error; goto error;
} }
if (pin == 0) { if (pin == 0) {
@ -929,7 +929,7 @@ static HRESULT WINAPI GraphBuilder_Render(IGraphBuilder *iface,
/* Connect the pin to render to the renderer */ /* Connect the pin to render to the renderer */
hr = IGraphBuilder_Connect(iface, ppinOut, ppinfilter); hr = IGraphBuilder_Connect(iface, ppinOut, ppinfilter);
if (FAILED(hr)) { if (FAILED(hr)) {
TRACE("Unable to connect to renderer (%lx)\n", hr); TRACE("Unable to connect to renderer (%x)\n", hr);
goto error; goto error;
} }
break; break;
@ -1007,19 +1007,19 @@ static HRESULT WINAPI GraphBuilder_RenderFile(IGraphBuilder *iface,
hr = GetFilterInfo(pMoniker, &clsid, &var); hr = GetFilterInfo(pMoniker, &clsid, &var);
IMoniker_Release(pMoniker); IMoniker_Release(pMoniker);
if (FAILED(hr)) { if (FAILED(hr)) {
ERR("Unable to retrieve filter info (%lx)\n", hr); ERR("Unable to retrieve filter info (%x)\n", hr);
continue; continue;
} }
hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)&psplitter); hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)&psplitter);
if (FAILED(hr)) { if (FAILED(hr)) {
ERR("Unable to create filter (%lx), trying next one\n", hr); ERR("Unable to create filter (%x), trying next one\n", hr);
continue; continue;
} }
hr = IGraphBuilder_AddFilter(iface, psplitter, NULL); hr = IGraphBuilder_AddFilter(iface, psplitter, NULL);
if (FAILED(hr)) { if (FAILED(hr)) {
ERR("Unable add filter (%lx)\n", hr); ERR("Unable add filter (%x)\n", hr);
return hr; return hr;
} }
@ -1027,12 +1027,12 @@ static HRESULT WINAPI GraphBuilder_RenderFile(IGraphBuilder *iface,
/* Make the splitter analyze incoming data */ /* Make the splitter analyze incoming data */
hr = IBaseFilter_EnumPins(preader, &penumpins); hr = IBaseFilter_EnumPins(preader, &penumpins);
if (FAILED(hr)) { if (FAILED(hr)) {
ERR("Enumpins (%lx)\n", hr); ERR("Enumpins (%x)\n", hr);
return hr; return hr;
} }
hr = IEnumPins_Next(penumpins, 1, &ppinreader, &pin); hr = IEnumPins_Next(penumpins, 1, &ppinreader, &pin);
if (FAILED(hr)) { if (FAILED(hr)) {
ERR("Next (%lx)\n", hr); ERR("Next (%x)\n", hr);
return hr; return hr;
} }
if (pin == 0) { if (pin == 0) {
@ -1043,12 +1043,12 @@ static HRESULT WINAPI GraphBuilder_RenderFile(IGraphBuilder *iface,
hr = IBaseFilter_EnumPins(psplitter, &penumpins); hr = IBaseFilter_EnumPins(psplitter, &penumpins);
if (FAILED(hr)) { if (FAILED(hr)) {
ERR("Splitter Enumpins (%lx)\n", hr); ERR("Splitter Enumpins (%x)\n", hr);
return hr; return hr;
} }
hr = IEnumPins_Next(penumpins, 1, &ppinsplitter, &pin); hr = IEnumPins_Next(penumpins, 1, &ppinsplitter, &pin);
if (FAILED(hr)) { if (FAILED(hr)) {
ERR("Next (%lx)\n", hr); ERR("Next (%x)\n", hr);
return hr; return hr;
} }
if (pin == 0) { if (pin == 0) {
@ -1061,7 +1061,7 @@ static HRESULT WINAPI GraphBuilder_RenderFile(IGraphBuilder *iface,
if (FAILED(hr)) { if (FAILED(hr)) {
IBaseFilter_Release(ppinsplitter); IBaseFilter_Release(ppinsplitter);
ppinsplitter = NULL; ppinsplitter = NULL;
TRACE("Cannot connect to filter (%lx), trying next one\n", hr); TRACE("Cannot connect to filter (%x), trying next one\n", hr);
break; break;
} }
TRACE("Successfully connected to filter\n"); TRACE("Successfully connected to filter\n");
@ -1074,12 +1074,12 @@ static HRESULT WINAPI GraphBuilder_RenderFile(IGraphBuilder *iface,
if (SUCCEEDED(hr)) { if (SUCCEEDED(hr)) {
int i; int i;
TRACE("pins to consider: %ld\n", nb); TRACE("pins to consider: %d\n", nb);
for(i = 0; i < nb; i++) { for(i = 0; i < nb; i++) {
TRACE("Processing pin %d\n", i); TRACE("Processing pin %d\n", i);
hr = IGraphBuilder_Render(iface, ppins[i]); hr = IGraphBuilder_Render(iface, ppins[i]);
if (FAILED(hr)) { if (FAILED(hr)) {
ERR("Cannot render pin %p (%lx)\n", ppins[i], hr); ERR("Cannot render pin %p (%x)\n", ppins[i], hr);
/* FIXME: We should clean created things properly */ /* FIXME: We should clean created things properly */
break; break;
} }
@ -1106,33 +1106,33 @@ static HRESULT WINAPI GraphBuilder_AddSourceFilter(IGraphBuilder *iface,
/* Instantiate a file source filter */ /* Instantiate a file source filter */
hr = CoCreateInstance(&CLSID_AsyncReader, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)&preader); hr = CoCreateInstance(&CLSID_AsyncReader, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)&preader);
if (FAILED(hr)) { if (FAILED(hr)) {
ERR("Unable to create file source filter (%lx)\n", hr); ERR("Unable to create file source filter (%x)\n", hr);
return hr; return hr;
} }
hr = IGraphBuilder_AddFilter(iface, preader, lpcwstrFilterName); hr = IGraphBuilder_AddFilter(iface, preader, lpcwstrFilterName);
if (FAILED(hr)) { if (FAILED(hr)) {
ERR("Unable add filter (%lx)\n", hr); ERR("Unable add filter (%x)\n", hr);
IBaseFilter_Release(preader); IBaseFilter_Release(preader);
return hr; return hr;
} }
hr = IBaseFilter_QueryInterface(preader, &IID_IFileSourceFilter, (LPVOID*)&pfile); hr = IBaseFilter_QueryInterface(preader, &IID_IFileSourceFilter, (LPVOID*)&pfile);
if (FAILED(hr)) { if (FAILED(hr)) {
ERR("Unable to get IFileSourceInterface (%lx)\n", hr); ERR("Unable to get IFileSourceInterface (%x)\n", hr);
goto error; goto error;
} }
/* Load the file in the file source filter */ /* Load the file in the file source filter */
hr = IFileSourceFilter_Load(pfile, lpcwstrFileName, NULL); hr = IFileSourceFilter_Load(pfile, lpcwstrFileName, NULL);
if (FAILED(hr)) { if (FAILED(hr)) {
ERR("Load (%lx)\n", hr); ERR("Load (%x)\n", hr);
goto error; goto error;
} }
IFileSourceFilter_GetCurFile(pfile, &filename, &mt); IFileSourceFilter_GetCurFile(pfile, &filename, &mt);
if (FAILED(hr)) { if (FAILED(hr)) {
ERR("GetCurFile (%lx)\n", hr); ERR("GetCurFile (%x)\n", hr);
goto error; goto error;
} }
TRACE("File %s\n", debugstr_w(filename)); TRACE("File %s\n", debugstr_w(filename));
@ -1157,7 +1157,7 @@ static HRESULT WINAPI GraphBuilder_SetLogFile(IGraphBuilder *iface,
DWORD_PTR hFile) { DWORD_PTR hFile) {
ICOM_THIS_MULTI(IFilterGraphImpl, IGraphBuilder_vtbl, iface); ICOM_THIS_MULTI(IFilterGraphImpl, IGraphBuilder_vtbl, iface);
TRACE("(%p/%p)->(%08lx): stub !!!\n", This, iface, (DWORD) hFile); TRACE("(%p/%p)->(%08x): stub !!!\n", This, iface, (DWORD) hFile);
return S_OK; return S_OK;
} }
@ -1245,7 +1245,7 @@ static HRESULT WINAPI MediaControl_GetTypeInfo(IMediaControl *iface,
ITypeInfo**ppTInfo) { ITypeInfo**ppTInfo) {
ICOM_THIS_MULTI(IFilterGraphImpl, IMediaControl_vtbl, iface); ICOM_THIS_MULTI(IFilterGraphImpl, IMediaControl_vtbl, iface);
TRACE("(%p/%p)->(%d, %ld, %p): stub !!!\n", This, iface, iTInfo, lcid, ppTInfo); TRACE("(%p/%p)->(%d, %d, %p): stub !!!\n", This, iface, iTInfo, lcid, ppTInfo);
return S_OK; return S_OK;
} }
@ -1258,7 +1258,7 @@ static HRESULT WINAPI MediaControl_GetIDsOfNames(IMediaControl *iface,
DISPID*rgDispId) { DISPID*rgDispId) {
ICOM_THIS_MULTI(IFilterGraphImpl, IMediaControl_vtbl, iface); ICOM_THIS_MULTI(IFilterGraphImpl, IMediaControl_vtbl, iface);
TRACE("(%p/%p)->(%s (%p), %p, %d, %ld, %p): stub !!!\n", This, iface, debugstr_guid(riid), riid, rgszNames, cNames, lcid, rgDispId); TRACE("(%p/%p)->(%s (%p), %p, %d, %d, %p): stub !!!\n", This, iface, debugstr_guid(riid), riid, rgszNames, cNames, lcid, rgDispId);
return S_OK; return S_OK;
} }
@ -1274,7 +1274,7 @@ static HRESULT WINAPI MediaControl_Invoke(IMediaControl *iface,
UINT*puArgErr) { UINT*puArgErr) {
ICOM_THIS_MULTI(IFilterGraphImpl, IMediaControl_vtbl, iface); ICOM_THIS_MULTI(IFilterGraphImpl, IMediaControl_vtbl, iface);
TRACE("(%p/%p)->(%ld, %s (%p), %ld, %04x, %p, %p, %p, %p): stub !!!\n", This, iface, dispIdMember, debugstr_guid(riid), riid, lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr); TRACE("(%p/%p)->(%d, %s (%p), %d, %04x, %p, %p, %p, %p): stub !!!\n", This, iface, dispIdMember, debugstr_guid(riid), riid, lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr);
return S_OK; return S_OK;
} }
@ -1365,7 +1365,7 @@ static HRESULT SendFilterMessage(IMediaControl *iface, fnFoundFilter FoundFilter
hr = IBaseFilter_EnumPins(pfilter, &pEnum); hr = IBaseFilter_EnumPins(pfilter, &pEnum);
if (hr != S_OK) if (hr != S_OK)
{ {
ERR("Enum pins failed %lx\n", hr); ERR("Enum pins failed %x\n", hr);
continue; continue;
} }
/* Check if it is a source filter */ /* Check if it is a source filter */
@ -1443,7 +1443,7 @@ static HRESULT WINAPI MediaControl_GetState(IMediaControl *iface,
OAFilterState *pfs) { OAFilterState *pfs) {
ICOM_THIS_MULTI(IFilterGraphImpl, IMediaControl_vtbl, iface); ICOM_THIS_MULTI(IFilterGraphImpl, IMediaControl_vtbl, iface);
TRACE("(%p/%p)->(%ld, %p): semi-stub !!!\n", This, iface, msTimeout, pfs); TRACE("(%p/%p)->(%d, %p): semi-stub !!!\n", This, iface, msTimeout, pfs);
EnterCriticalSection(&This->cs); EnterCriticalSection(&This->cs);
@ -1659,7 +1659,7 @@ static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface,
DWORD dwStopFlags) { DWORD dwStopFlags) {
ICOM_THIS_MULTI(IFilterGraphImpl, IMediaSeeking_vtbl, iface); ICOM_THIS_MULTI(IFilterGraphImpl, IMediaSeeking_vtbl, iface);
TRACE("(%p/%p)->(%p, %08lx, %p, %08lx): stub !!!\n", This, iface, pCurrent, dwCurrentFlags, pStop, dwStopFlags); TRACE("(%p/%p)->(%p, %08x, %p, %08x): stub !!!\n", This, iface, pCurrent, dwCurrentFlags, pStop, dwStopFlags);
return S_OK; return S_OK;
} }
@ -1837,7 +1837,7 @@ static HRESULT WINAPI BasicAudio_GetTypeInfo(IBasicAudio *iface,
IBasicAudio* pBasicAudio; IBasicAudio* pBasicAudio;
HRESULT hr; HRESULT hr;
TRACE("(%p/%p)->(%d, %ld, %p)\n", This, iface, iTInfo, lcid, ppTInfo); TRACE("(%p/%p)->(%d, %d, %p)\n", This, iface, iTInfo, lcid, ppTInfo);
EnterCriticalSection(&This->cs); EnterCriticalSection(&This->cs);
@ -1861,7 +1861,7 @@ static HRESULT WINAPI BasicAudio_GetIDsOfNames(IBasicAudio *iface,
IBasicAudio* pBasicAudio; IBasicAudio* pBasicAudio;
HRESULT hr; HRESULT hr;
TRACE("(%p/%p)->(%s (%p), %p, %d, %ld, %p)\n", This, iface, debugstr_guid(riid), riid, rgszNames, cNames, lcid, rgDispId); TRACE("(%p/%p)->(%s (%p), %p, %d, %d, %p)\n", This, iface, debugstr_guid(riid), riid, rgszNames, cNames, lcid, rgDispId);
EnterCriticalSection(&This->cs); EnterCriticalSection(&This->cs);
@ -1888,7 +1888,7 @@ static HRESULT WINAPI BasicAudio_Invoke(IBasicAudio *iface,
IBasicAudio* pBasicAudio; IBasicAudio* pBasicAudio;
HRESULT hr; HRESULT hr;
TRACE("(%p/%p)->(%ld, %s (%p), %ld, %04x, %p, %p, %p, %p)\n", This, iface, dispIdMember, debugstr_guid(riid), riid, lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr); TRACE("(%p/%p)->(%d, %s (%p), %d, %04x, %p, %p, %p, %p)\n", This, iface, dispIdMember, debugstr_guid(riid), riid, lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr);
EnterCriticalSection(&This->cs); EnterCriticalSection(&This->cs);
@ -2054,7 +2054,7 @@ static HRESULT WINAPI BasicVideo_GetTypeInfo(IBasicVideo *iface,
IBasicVideo* pBasicVideo; IBasicVideo* pBasicVideo;
HRESULT hr; HRESULT hr;
TRACE("(%p/%p)->(%d, %ld, %p)\n", This, iface, iTInfo, lcid, ppTInfo); TRACE("(%p/%p)->(%d, %d, %p)\n", This, iface, iTInfo, lcid, ppTInfo);
EnterCriticalSection(&This->cs); EnterCriticalSection(&This->cs);
@ -2078,7 +2078,7 @@ static HRESULT WINAPI BasicVideo_GetIDsOfNames(IBasicVideo *iface,
IBasicVideo* pBasicVideo; IBasicVideo* pBasicVideo;
HRESULT hr; HRESULT hr;
TRACE("(%p/%p)->(%s (%p), %p, %d, %ld, %p)\n", This, iface, debugstr_guid(riid), riid, rgszNames, cNames, lcid, rgDispId); TRACE("(%p/%p)->(%s (%p), %p, %d, %d, %p)\n", This, iface, debugstr_guid(riid), riid, rgszNames, cNames, lcid, rgDispId);
EnterCriticalSection(&This->cs); EnterCriticalSection(&This->cs);
@ -2105,7 +2105,7 @@ static HRESULT WINAPI BasicVideo_Invoke(IBasicVideo *iface,
IBasicVideo* pBasicVideo; IBasicVideo* pBasicVideo;
HRESULT hr; HRESULT hr;
TRACE("(%p/%p)->(%ld, %s (%p), %ld, %04x, %p, %p, %p, %p)\n", This, iface, dispIdMember, debugstr_guid(riid), riid, lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr); TRACE("(%p/%p)->(%d, %s (%p), %d, %04x, %p, %p, %p, %p)\n", This, iface, dispIdMember, debugstr_guid(riid), riid, lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr);
EnterCriticalSection(&This->cs); EnterCriticalSection(&This->cs);
@ -2874,7 +2874,7 @@ static HRESULT WINAPI VideoWindow_GetTypeInfo(IVideoWindow *iface,
IVideoWindow* pVideoWindow; IVideoWindow* pVideoWindow;
HRESULT hr; HRESULT hr;
TRACE("(%p/%p)->(%d, %ld, %p)\n", This, iface, iTInfo, lcid, ppTInfo); TRACE("(%p/%p)->(%d, %d, %p)\n", This, iface, iTInfo, lcid, ppTInfo);
EnterCriticalSection(&This->cs); EnterCriticalSection(&This->cs);
@ -2898,7 +2898,7 @@ static HRESULT WINAPI VideoWindow_GetIDsOfNames(IVideoWindow *iface,
IVideoWindow* pVideoWindow; IVideoWindow* pVideoWindow;
HRESULT hr; HRESULT hr;
TRACE("(%p/%p)->(%s (%p), %p, %d, %ld, %p)\n", This, iface, debugstr_guid(riid), riid, rgszNames, cNames, lcid, rgDispId); TRACE("(%p/%p)->(%s (%p), %p, %d, %d, %p)\n", This, iface, debugstr_guid(riid), riid, rgszNames, cNames, lcid, rgDispId);
EnterCriticalSection(&This->cs); EnterCriticalSection(&This->cs);
@ -2925,7 +2925,7 @@ static HRESULT WINAPI VideoWindow_Invoke(IVideoWindow *iface,
IVideoWindow* pVideoWindow; IVideoWindow* pVideoWindow;
HRESULT hr; HRESULT hr;
TRACE("(%p/%p)->(%ld, %s (%p), %ld, %04x, %p, %p, %p, %p)\n", This, iface, dispIdMember, debugstr_guid(riid), riid, lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr); TRACE("(%p/%p)->(%d, %s (%p), %d, %04x, %p, %p, %p, %p)\n", This, iface, dispIdMember, debugstr_guid(riid), riid, lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr);
EnterCriticalSection(&This->cs); EnterCriticalSection(&This->cs);
@ -3387,7 +3387,7 @@ static HRESULT WINAPI VideoWindow_put_Owner(IVideoWindow *iface,
IVideoWindow* pVideoWindow; IVideoWindow* pVideoWindow;
HRESULT hr; HRESULT hr;
TRACE("(%p/%p)->(%08lx)\n", This, iface, (DWORD) Owner); TRACE("(%p/%p)->(%08x)\n", This, iface, (DWORD) Owner);
EnterCriticalSection(&This->cs); EnterCriticalSection(&This->cs);
@ -3427,7 +3427,7 @@ static HRESULT WINAPI VideoWindow_put_MessageDrain(IVideoWindow *iface,
IVideoWindow* pVideoWindow; IVideoWindow* pVideoWindow;
HRESULT hr; HRESULT hr;
TRACE("(%p/%p)->(%08lx)\n", This, iface, (DWORD) Drain); TRACE("(%p/%p)->(%08x)\n", This, iface, (DWORD) Drain);
EnterCriticalSection(&This->cs); EnterCriticalSection(&This->cs);
@ -3570,7 +3570,7 @@ static HRESULT WINAPI VideoWindow_NotifyOwnerMessage(IVideoWindow *iface,
IVideoWindow* pVideoWindow; IVideoWindow* pVideoWindow;
HRESULT hr; HRESULT hr;
TRACE("(%p/%p)->(%08lx, %ld, %08lx, %08lx)\n", This, iface, (DWORD) hwnd, uMsg, wParam, lParam); TRACE("(%p/%p)->(%08x, %ld, %08lx, %08lx)\n", This, iface, (DWORD) hwnd, uMsg, wParam, lParam);
EnterCriticalSection(&This->cs); EnterCriticalSection(&This->cs);
@ -3830,7 +3830,7 @@ static HRESULT WINAPI MediaEvent_GetTypeInfo(IMediaEventEx *iface,
ITypeInfo**ppTInfo) { ITypeInfo**ppTInfo) {
ICOM_THIS_MULTI(IFilterGraphImpl, IMediaEventEx_vtbl, iface); ICOM_THIS_MULTI(IFilterGraphImpl, IMediaEventEx_vtbl, iface);
TRACE("(%p/%p)->(%d, %ld, %p): stub !!!\n", This, iface, iTInfo, lcid, ppTInfo); TRACE("(%p/%p)->(%d, %d, %p): stub !!!\n", This, iface, iTInfo, lcid, ppTInfo);
return S_OK; return S_OK;
} }
@ -3843,7 +3843,7 @@ static HRESULT WINAPI MediaEvent_GetIDsOfNames(IMediaEventEx *iface,
DISPID*rgDispId) { DISPID*rgDispId) {
ICOM_THIS_MULTI(IFilterGraphImpl, IMediaEventEx_vtbl, iface); ICOM_THIS_MULTI(IFilterGraphImpl, IMediaEventEx_vtbl, iface);
TRACE("(%p/%p)->(%s (%p), %p, %d, %ld, %p): stub !!!\n", This, iface, debugstr_guid(riid), riid, rgszNames, cNames, lcid, rgDispId); TRACE("(%p/%p)->(%s (%p), %p, %d, %d, %p): stub !!!\n", This, iface, debugstr_guid(riid), riid, rgszNames, cNames, lcid, rgDispId);
return S_OK; return S_OK;
} }
@ -3859,7 +3859,7 @@ static HRESULT WINAPI MediaEvent_Invoke(IMediaEventEx *iface,
UINT*puArgErr) { UINT*puArgErr) {
ICOM_THIS_MULTI(IFilterGraphImpl, IMediaEventEx_vtbl, iface); ICOM_THIS_MULTI(IFilterGraphImpl, IMediaEventEx_vtbl, iface);
TRACE("(%p/%p)->(%ld, %s (%p), %ld, %04x, %p, %p, %p, %p): stub !!!\n", This, iface, dispIdMember, debugstr_guid(riid), riid, lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr); TRACE("(%p/%p)->(%d, %s (%p), %d, %04x, %p, %p, %p, %p): stub !!!\n", This, iface, dispIdMember, debugstr_guid(riid), riid, lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr);
return S_OK; return S_OK;
} }
@ -3965,7 +3965,7 @@ static HRESULT WINAPI MediaEvent_SetNotifyWindow(IMediaEventEx *iface,
LONG_PTR lInstanceData) { LONG_PTR lInstanceData) {
ICOM_THIS_MULTI(IFilterGraphImpl, IMediaEventEx_vtbl, iface); ICOM_THIS_MULTI(IFilterGraphImpl, IMediaEventEx_vtbl, iface);
TRACE("(%p/%p)->(%08lx, %ld, %08lx)\n", This, iface, (DWORD) hwnd, lMsg, lInstanceData); TRACE("(%p/%p)->(%08x, %ld, %08lx)\n", This, iface, (DWORD) hwnd, lMsg, lInstanceData);
This->notif.hWnd = (HWND)hwnd; This->notif.hWnd = (HWND)hwnd;
This->notif.msg = lMsg; This->notif.msg = lMsg;
@ -4075,7 +4075,7 @@ static HRESULT WINAPI MediaFilter_Run(IMediaFilter *iface, REFERENCE_TIME tStart
static HRESULT WINAPI MediaFilter_GetState(IMediaFilter *iface, DWORD dwMsTimeout, FILTER_STATE * pState) static HRESULT WINAPI MediaFilter_GetState(IMediaFilter *iface, DWORD dwMsTimeout, FILTER_STATE * pState)
{ {
FIXME("(%ld, %p): stub\n", dwMsTimeout, pState); FIXME("(%d, %p): stub\n", dwMsTimeout, pState);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -4215,7 +4215,7 @@ static HRESULT WINAPI GraphConfig_Reconnect(IGraphConfig *iface,
{ {
ICOM_THIS_MULTI(IFilterGraphImpl, IGraphConfig_vtbl, iface); ICOM_THIS_MULTI(IFilterGraphImpl, IGraphConfig_vtbl, iface);
FIXME("(%p)->(%p, %p, %p, %p, %p, %lx): stub!\n", This, pOutputPin, pInputPin, pmtFirstConnection, pUsingFilter, hAbortEvent, dwFlags); FIXME("(%p)->(%p, %p, %p, %p, %p, %x): stub!\n", This, pOutputPin, pInputPin, pmtFirstConnection, pUsingFilter, hAbortEvent, dwFlags);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -4228,7 +4228,7 @@ static HRESULT WINAPI GraphConfig_Reconfigure(IGraphConfig *iface,
{ {
ICOM_THIS_MULTI(IFilterGraphImpl, IGraphConfig_vtbl, iface); ICOM_THIS_MULTI(IFilterGraphImpl, IGraphConfig_vtbl, iface);
FIXME("(%p)->(%p, %p, %lx, %p): stub!\n", This, pCallback, pvContext, dwFlags, hAbortEvent); FIXME("(%p)->(%p, %p, %x, %p): stub!\n", This, pCallback, pvContext, dwFlags, hAbortEvent);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -4291,7 +4291,7 @@ static HRESULT WINAPI GraphConfig_SetFilterFlags(IGraphConfig *iface,
{ {
ICOM_THIS_MULTI(IFilterGraphImpl, IGraphConfig_vtbl, iface); ICOM_THIS_MULTI(IFilterGraphImpl, IGraphConfig_vtbl, iface);
FIXME("(%p)->(%p, %lx): stub!\n", This, pFilter, dwFlags); FIXME("(%p)->(%p, %x): stub!\n", This, pFilter, dwFlags);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -4313,7 +4313,7 @@ static HRESULT WINAPI GraphConfig_RemoveFilterEx(IGraphConfig *iface,
{ {
ICOM_THIS_MULTI(IFilterGraphImpl, IGraphConfig_vtbl, iface); ICOM_THIS_MULTI(IFilterGraphImpl, IGraphConfig_vtbl, iface);
FIXME("(%p)->(%p, %lx): stub!\n", This, pFilter, dwFlags); FIXME("(%p)->(%p, %x): stub!\n", This, pFilter, dwFlags);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -4377,7 +4377,7 @@ HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj)
hr = CoCreateInstance(&CLSID_FilterMapper, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterMapper2, (LPVOID*)&fimpl->pFilterMapper2); hr = CoCreateInstance(&CLSID_FilterMapper, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterMapper2, (LPVOID*)&fimpl->pFilterMapper2);
if (FAILED(hr)) { if (FAILED(hr)) {
ERR("Unable to create filter mapper (%lx)\n", hr); ERR("Unable to create filter mapper (%x)\n", hr);
return hr; return hr;
} }

18
dlls/quartz/filtermapper.c
View file

@ -248,7 +248,7 @@ static HRESULT WINAPI FilterMapper2_CreateCategory(
LONG lRet; LONG lRet;
HRESULT hr; HRESULT hr;
TRACE("(%s, %lx, %s)\n", debugstr_guid(clsidCategory), dwCategoryMerit, debugstr_w(szDescription)); TRACE("(%s, %x, %s)\n", debugstr_guid(clsidCategory), dwCategoryMerit, debugstr_w(szDescription));
hr = StringFromCLSID(&CLSID_ActiveMovieCategories, &wClsidAMCat); hr = StringFromCLSID(&CLSID_ActiveMovieCategories, &wClsidAMCat);
@ -515,7 +515,7 @@ static HRESULT FM2_ReadFilterData(IPropertyBag * pPropBag, REGFILTER2 * prf2)
if (prrf->dwVersion != 2) if (prrf->dwVersion != 2)
{ {
FIXME("Filter registry version %ld not supported\n", prrf->dwVersion); FIXME("Filter registry version %d not supported\n", prrf->dwVersion);
ZeroMemory(prf2, sizeof(*prf2)); ZeroMemory(prf2, sizeof(*prf2));
hr = E_FAIL; hr = E_FAIL;
} }
@ -523,7 +523,7 @@ static HRESULT FM2_ReadFilterData(IPropertyBag * pPropBag, REGFILTER2 * prf2)
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
{ {
TRACE("version = %ld, merit = %lx, #pins = %ld, unused = %lx\n", TRACE("version = %d, merit = %x, #pins = %d, unused = %x\n",
prrf->dwVersion, prrf->dwMerit, prrf->dwPins, prrf->dwUnused); prrf->dwVersion, prrf->dwMerit, prrf->dwPins, prrf->dwUnused);
prf2->dwVersion = prrf->dwVersion; prf2->dwVersion = prrf->dwVersion;
@ -544,7 +544,7 @@ static HRESULT FM2_ReadFilterData(IPropertyBag * pPropBag, REGFILTER2 * prf2)
TRACE("\tsignature = %s\n", debugstr_an((const char*)prrfp->signature, 4)); TRACE("\tsignature = %s\n", debugstr_an((const char*)prrfp->signature, 4));
TRACE("\tpin[%ld]: flags = %lx, instances = %ld, media types = %ld, mediums = %ld\n", TRACE("\tpin[%d]: flags = %x, instances = %d, media types = %d, mediums = %d\n",
i, prrfp->dwFlags, prrfp->dwInstances, prrfp->dwMediaTypes, prrfp->dwMediums); i, prrfp->dwFlags, prrfp->dwInstances, prrfp->dwMediaTypes, prrfp->dwMediums);
rgPins2[i].dwFlags = prrfp->dwFlags; rgPins2[i].dwFlags = prrfp->dwFlags;
@ -787,7 +787,7 @@ static HRESULT WINAPI FilterMapper2_RegisterFilter(
CoTaskMemFree(pregfp2); CoTaskMemFree(pregfp2);
TRACE("-- returning %lx\n", hr); TRACE("-- returning %x\n", hr);
return hr; return hr;
} }
@ -866,7 +866,7 @@ static HRESULT WINAPI FilterMapper2_EnumMatchingFilters(
HRESULT hr; HRESULT hr;
struct Vector monikers = {NULL, 0, 0}; struct Vector monikers = {NULL, 0, 0};
TRACE("(%p, %lx, %s, %lx, %s, %ld, %p, %p, %p, %s, %s, %p, %p, %p)\n", TRACE("(%p, %x, %s, %x, %s, %d, %p, %p, %p, %s, %s, %p, %p, %p)\n",
ppEnum, ppEnum,
dwFlags, dwFlags,
bExactMatch ? "true" : "false", bExactMatch ? "true" : "false",
@ -884,7 +884,7 @@ static HRESULT WINAPI FilterMapper2_EnumMatchingFilters(
if (dwFlags != 0) if (dwFlags != 0)
{ {
FIXME("dwFlags = %lx not implemented\n", dwFlags); FIXME("dwFlags = %x not implemented\n", dwFlags);
} }
*ppEnum = NULL; *ppEnum = NULL;
@ -1095,7 +1095,7 @@ static HRESULT WINAPI FilterMapper_EnumMatchingFilters(
REGFILTER* regfilters; REGFILTER* regfilters;
HRESULT hr; HRESULT hr;
TRACE("(%p/%p)->(%p, %lx, %s, %s, %s, %s, %s, %s, %s) stub!\n", TRACE("(%p/%p)->(%p, %x, %s, %s, %s, %s, %s, %s, %s) stub!\n",
iface,This, iface,This,
ppEnum, ppEnum,
dwMerit, dwMerit,
@ -1220,7 +1220,7 @@ static HRESULT WINAPI FilterMapper_RegisterFilter(IFilterMapper * iface, CLSID c
LONG lRet; LONG lRet;
WCHAR wszKeyName[strlenW(wszFilterSlash) + (CHARS_IN_GUID-1) + 1]; WCHAR wszKeyName[strlenW(wszFilterSlash) + (CHARS_IN_GUID-1) + 1];
TRACE("(%p)->(%s, %s, %lx)\n", iface, debugstr_guid(&clsid), debugstr_w(szName), dwMerit); TRACE("(%p)->(%s, %s, %x)\n", iface, debugstr_guid(&clsid), debugstr_w(szName), dwMerit);
hr = StringFromCLSID(&clsid, &wszClsid); hr = StringFromCLSID(&clsid, &wszClsid);

10
dlls/quartz/main.c
View file

@ -256,13 +256,13 @@ const char * qzdebugstr_State(FILTER_STATE state)
LONG WINAPI AmpFactorToDB(LONG ampfactor) LONG WINAPI AmpFactorToDB(LONG ampfactor)
{ {
FIXME("(%ld) Stub!\n", ampfactor); FIXME("(%d) Stub!\n", ampfactor);
return 0; return 0;
} }
LONG WINAPI DBToAmpFactor(LONG db) LONG WINAPI DBToAmpFactor(LONG db)
{ {
FIXME("(%ld) Stub!\n", db); FIXME("(%d) Stub!\n", db);
/* Avoid divide by zero (probably during range computation) in Windows Media Player 6.4 */ /* Avoid divide by zero (probably during range computation) in Windows Media Player 6.4 */
if (db < -1000) if (db < -1000)
return 0; return 0;
@ -272,10 +272,10 @@ LONG WINAPI DBToAmpFactor(LONG db)
DWORD WINAPI AMGetErrorTextA(HRESULT hr, char *buffer, DWORD maxlen) DWORD WINAPI AMGetErrorTextA(HRESULT hr, char *buffer, DWORD maxlen)
{ {
int len; int len;
static const char format[] = "Error: 0x%lx"; static const char format[] = "Error: 0x%x";
char error[MAX_ERROR_TEXT_LEN]; char error[MAX_ERROR_TEXT_LEN];
FIXME("(%lx,%p,%ld) stub\n", hr, buffer, maxlen); FIXME("(%x,%p,%d) stub\n", hr, buffer, maxlen);
if (!buffer) return 0; if (!buffer) return 0;
wsprintfA(error, format, hr); wsprintfA(error, format, hr);
@ -290,7 +290,7 @@ DWORD WINAPI AMGetErrorTextW(HRESULT hr, WCHAR *buffer, DWORD maxlen)
static const WCHAR format[] = {'E','r','r','o','r',':',' ','0','x','%','l','x',0}; static const WCHAR format[] = {'E','r','r','o','r',':',' ','0','x','%','l','x',0};
WCHAR error[MAX_ERROR_TEXT_LEN]; WCHAR error[MAX_ERROR_TEXT_LEN];
FIXME("(%lx,%p,%ld) stub\n", hr, buffer, maxlen); FIXME("(%x,%p,%d) stub\n", hr, buffer, maxlen);
if (!buffer) return 0; if (!buffer) return 0;
wsprintfW(error, format, hr); wsprintfW(error, format, hr);

44
dlls/quartz/memallocator.c
View file

@ -39,16 +39,16 @@ void dump_AM_SAMPLE2_PROPERTIES(AM_SAMPLE2_PROPERTIES * pProps)
TRACE("AM_SAMPLE2_PROPERTIES: (null)\n"); TRACE("AM_SAMPLE2_PROPERTIES: (null)\n");
return; return;
} }
TRACE("\tcbData: %ld\n", pProps->cbData); TRACE("\tcbData: %d\n", pProps->cbData);
TRACE("\tdwTypeSpecificFlags: 0x%8lx\n", pProps->dwTypeSpecificFlags); TRACE("\tdwTypeSpecificFlags: 0x%8x\n", pProps->dwTypeSpecificFlags);
TRACE("\tdwSampleFlags: 0x%8lx\n", pProps->dwSampleFlags); TRACE("\tdwSampleFlags: 0x%8x\n", pProps->dwSampleFlags);
TRACE("\tlActual: %ld\n", pProps->lActual); TRACE("\tlActual: %d\n", pProps->lActual);
TRACE("\ttStart: %lx%08lx%s\n", (LONG)(pProps->tStart >> 32), (LONG)pProps->tStart, pProps->dwSampleFlags & AM_SAMPLE_TIMEVALID ? "" : " (not valid)"); TRACE("\ttStart: %x%08x%s\n", (LONG)(pProps->tStart >> 32), (LONG)pProps->tStart, pProps->dwSampleFlags & AM_SAMPLE_TIMEVALID ? "" : " (not valid)");
TRACE("\ttStop: %lx%08lx%s\n", (LONG)(pProps->tStop >> 32), (LONG)pProps->tStop, pProps->dwSampleFlags & AM_SAMPLE_STOPVALID ? "" : " (not valid)"); TRACE("\ttStop: %x%08x%s\n", (LONG)(pProps->tStop >> 32), (LONG)pProps->tStop, pProps->dwSampleFlags & AM_SAMPLE_STOPVALID ? "" : " (not valid)");
TRACE("\tdwStreamId: 0x%lx\n", pProps->dwStreamId); TRACE("\tdwStreamId: 0x%x\n", pProps->dwStreamId);
TRACE("\tpMediaType: %p\n", pProps->pMediaType); TRACE("\tpMediaType: %p\n", pProps->pMediaType);
TRACE("\tpbBuffer: %p\n", pProps->pbBuffer); TRACE("\tpbBuffer: %p\n", pProps->pbBuffer);
TRACE("\tcbBuffer: %ld\n", pProps->cbBuffer); TRACE("\tcbBuffer: %d\n", pProps->cbBuffer);
} }
typedef struct BaseMemAllocator typedef struct BaseMemAllocator
@ -137,7 +137,7 @@ static ULONG WINAPI BaseMemAllocator_AddRef(IMemAllocator * iface)
BaseMemAllocator *This = (BaseMemAllocator *)iface; BaseMemAllocator *This = (BaseMemAllocator *)iface;
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p)->() AddRef from %ld\n", iface, ref - 1); TRACE("(%p)->() AddRef from %d\n", iface, ref - 1);
return ref; return ref;
} }
@ -147,7 +147,7 @@ static ULONG WINAPI BaseMemAllocator_Release(IMemAllocator * iface)
BaseMemAllocator *This = (BaseMemAllocator *)iface; BaseMemAllocator *This = (BaseMemAllocator *)iface;
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p)->() Release from %ld\n", iface, ref + 1); TRACE("(%p)->() Release from %d\n", iface, ref + 1);
if (!ref) if (!ref)
{ {
@ -245,7 +245,7 @@ static HRESULT WINAPI BaseMemAllocator_Commit(IMemAllocator * iface)
{ {
if (!(This->hSemWaiting = CreateSemaphoreW(NULL, This->pProps->cBuffers, This->pProps->cBuffers, NULL))) if (!(This->hSemWaiting = CreateSemaphoreW(NULL, This->pProps->cBuffers, This->pProps->cBuffers, NULL)))
{ {
ERR("Couldn't create semaphore (error was %ld)\n", GetLastError()); ERR("Couldn't create semaphore (error was %d)\n", GetLastError());
hr = HRESULT_FROM_WIN32(GetLastError()); hr = HRESULT_FROM_WIN32(GetLastError());
} }
else else
@ -254,7 +254,7 @@ static HRESULT WINAPI BaseMemAllocator_Commit(IMemAllocator * iface)
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
This->bCommitted = TRUE; This->bCommitted = TRUE;
else else
ERR("fnAlloc failed with error 0x%lx\n", hr); ERR("fnAlloc failed with error 0x%x\n", hr);
} }
} }
} }
@ -294,7 +294,7 @@ static HRESULT WINAPI BaseMemAllocator_Decommit(IMemAllocator * iface)
hr = This->fnFree(iface); hr = This->fnFree(iface);
if (FAILED(hr)) if (FAILED(hr))
ERR("fnFree failed with error 0x%lx\n", hr); ERR("fnFree failed with error 0x%x\n", hr);
} }
} }
} }
@ -311,7 +311,7 @@ static HRESULT WINAPI BaseMemAllocator_GetBuffer(IMemAllocator * iface, IMediaSa
/* NOTE: The pStartTime and pEndTime parameters are not applied to the sample. /* NOTE: The pStartTime and pEndTime parameters are not applied to the sample.
* The allocator might use these values to determine which buffer it retrieves */ * The allocator might use these values to determine which buffer it retrieves */
TRACE("(%p)->(%p, %p, %p, %lx)\n", This, pSample, pStartTime, pEndTime, dwFlags); TRACE("(%p)->(%p, %p, %p, %x)\n", This, pSample, pStartTime, pEndTime, dwFlags);
*pSample = NULL; *pSample = NULL;
@ -385,7 +385,7 @@ static HRESULT WINAPI BaseMemAllocator_ReleaseBuffer(IMemAllocator * iface, IMed
This->hSemWaiting = NULL; This->hSemWaiting = NULL;
if (FAILED(hrfree = This->fnFree(iface))) if (FAILED(hrfree = This->fnFree(iface)))
ERR("fnFree failed with error 0x%lx\n", hrfree); ERR("fnFree failed with error 0x%x\n", hrfree);
} }
} }
LeaveCriticalSection(&This->csState); LeaveCriticalSection(&This->csState);
@ -393,7 +393,7 @@ static HRESULT WINAPI BaseMemAllocator_ReleaseBuffer(IMemAllocator * iface, IMed
/* notify a waiting thread that there is now a free buffer */ /* notify a waiting thread that there is now a free buffer */
if (!ReleaseSemaphore(This->hSemWaiting, 1, NULL)) if (!ReleaseSemaphore(This->hSemWaiting, 1, NULL))
{ {
ERR("ReleaseSemaphore failed with error %ld\n", GetLastError()); ERR("ReleaseSemaphore failed with error %d\n", GetLastError());
hr = HRESULT_FROM_WIN32(GetLastError()); hr = HRESULT_FROM_WIN32(GetLastError());
} }
@ -473,7 +473,7 @@ static ULONG WINAPI StdMediaSample2_AddRef(IMediaSample2 * iface)
StdMediaSample2 *This = (StdMediaSample2 *)iface; StdMediaSample2 *This = (StdMediaSample2 *)iface;
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p)->() AddRef from %ld\n", iface, ref - 1); TRACE("(%p)->() AddRef from %d\n", iface, ref - 1);
return ref; return ref;
} }
@ -483,7 +483,7 @@ static ULONG WINAPI StdMediaSample2_Release(IMediaSample2 * iface)
StdMediaSample2 *This = (StdMediaSample2 *)iface; StdMediaSample2 *This = (StdMediaSample2 *)iface;
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p)->() Release from %ld\n", iface, ref + 1); TRACE("(%p)->() Release from %d\n", iface, ref + 1);
if (!ref) if (!ref)
{ {
@ -618,7 +618,7 @@ static HRESULT WINAPI StdMediaSample2_SetActualDataLength(IMediaSample2 * iface,
{ {
StdMediaSample2 *This = (StdMediaSample2 *)iface; StdMediaSample2 *This = (StdMediaSample2 *)iface;
TRACE("(%ld)\n", len); TRACE("(%d)\n", len);
if ((len > This->props.cbBuffer) || (len < 0)) if ((len > This->props.cbBuffer) || (len < 0))
return VFW_E_BUFFER_OVERFLOW; return VFW_E_BUFFER_OVERFLOW;
@ -720,7 +720,7 @@ static HRESULT WINAPI StdMediaSample2_GetProperties(IMediaSample2 * iface, DWORD
{ {
StdMediaSample2 *This = (StdMediaSample2 *)iface; StdMediaSample2 *This = (StdMediaSample2 *)iface;
TRACE("(%ld, %p)\n", cbProperties, pbProperties); TRACE("(%d, %p)\n", cbProperties, pbProperties);
memcpy(pbProperties, &This->props, min(cbProperties, sizeof(This->props))); memcpy(pbProperties, &This->props, min(cbProperties, sizeof(This->props)));
@ -731,7 +731,7 @@ static HRESULT WINAPI StdMediaSample2_SetProperties(IMediaSample2 * iface, DWORD
{ {
StdMediaSample2 *This = (StdMediaSample2 *)iface; StdMediaSample2 *This = (StdMediaSample2 *)iface;
TRACE("(%ld, %p)\n", cbProperties, pbProperties); TRACE("(%d, %p)\n", cbProperties, pbProperties);
/* NOTE: pbBuffer and cbBuffer are read-only */ /* NOTE: pbBuffer and cbBuffer are read-only */
memcpy(&This->props, pbProperties, min(cbProperties, AM_SAMPLE2_PROP_SIZE_WRITABLE)); memcpy(&This->props, pbProperties, min(cbProperties, AM_SAMPLE2_PROP_SIZE_WRITABLE));
@ -821,7 +821,7 @@ static HRESULT StdMemAllocator_Free(IMemAllocator * iface)
/* free memory */ /* free memory */
if (!VirtualFree(This->pMemory, 0, MEM_RELEASE)) if (!VirtualFree(This->pMemory, 0, MEM_RELEASE))
{ {
ERR("Couldn't free memory. Error: %ld\n", GetLastError()); ERR("Couldn't free memory. Error: %d\n", GetLastError());
return HRESULT_FROM_WIN32(GetLastError()); return HRESULT_FROM_WIN32(GetLastError());
} }

10
dlls/quartz/parser.c
View file

@ -169,7 +169,7 @@ static ULONG WINAPI Parser_AddRef(IBaseFilter * iface)
ParserImpl *This = (ParserImpl *)iface; ParserImpl *This = (ParserImpl *)iface;
ULONG refCount = InterlockedIncrement(&This->refCount); ULONG refCount = InterlockedIncrement(&This->refCount);
TRACE("(%p/%p)->() AddRef from %ld\n", This, iface, refCount - 1); TRACE("(%p/%p)->() AddRef from %d\n", This, iface, refCount - 1);
return refCount; return refCount;
} }
@ -179,7 +179,7 @@ static ULONG WINAPI Parser_Release(IBaseFilter * iface)
ParserImpl *This = (ParserImpl *)iface; ParserImpl *This = (ParserImpl *)iface;
ULONG refCount = InterlockedDecrement(&This->refCount); ULONG refCount = InterlockedDecrement(&This->refCount);
TRACE("(%p/%p)->() Release from %ld\n", This, iface, refCount + 1); TRACE("(%p/%p)->() Release from %d\n", This, iface, refCount + 1);
if (!refCount) if (!refCount)
{ {
@ -342,7 +342,7 @@ static HRESULT WINAPI Parser_GetState(IBaseFilter * iface, DWORD dwMilliSecsTime
{ {
ParserImpl *This = (ParserImpl *)iface; ParserImpl *This = (ParserImpl *)iface;
TRACE("(%ld, %p)\n", dwMilliSecsTimeout, pState); TRACE("(%d, %p)\n", dwMilliSecsTimeout, pState);
EnterCriticalSection(&This->csFilter); EnterCriticalSection(&This->csFilter);
{ {
@ -503,7 +503,7 @@ HRESULT Parser_AddPin(ParserImpl * This, PIN_INFO * piOutput, ALLOCATOR_PROPERTI
{ {
HeapFree(GetProcessHeap(), 0, This->ppPins); HeapFree(GetProcessHeap(), 0, This->ppPins);
This->ppPins = ppOldPins; This->ppPins = ppOldPins;
ERR("Failed with error %lx\n", hr); ERR("Failed with error %x\n", hr);
} }
return hr; return hr;
@ -627,7 +627,7 @@ static ULONG WINAPI Parser_OutputPin_Release(IPin * iface)
Parser_OutputPin *This = (Parser_OutputPin *)iface; Parser_OutputPin *This = (Parser_OutputPin *)iface;
ULONG refCount = InterlockedDecrement(&This->pin.pin.refCount); ULONG refCount = InterlockedDecrement(&This->pin.pin.refCount);
TRACE("(%p)->() Release from %ld\n", iface, refCount + 1); TRACE("(%p)->() Release from %d\n", iface, refCount + 1);
if (!refCount) if (!refCount)
{ {

26
dlls/quartz/pin.c
View file

@ -113,7 +113,7 @@ static HRESULT OutputPin_ConnectSpecific(IPin * iface, IPin * pReceivePin, const
FreeMediaType(&This->pin.mtCurrent); FreeMediaType(&This->pin.mtCurrent);
} }
TRACE(" -- %lx\n", hr); TRACE(" -- %x\n", hr);
return hr; return hr;
} }
@ -232,7 +232,7 @@ ULONG WINAPI IPinImpl_AddRef(IPin * iface)
IPinImpl *This = (IPinImpl *)iface; IPinImpl *This = (IPinImpl *)iface;
ULONG refCount = InterlockedIncrement(&This->refCount); ULONG refCount = InterlockedIncrement(&This->refCount);
TRACE("(%p)->() AddRef from %ld\n", iface, refCount - 1); TRACE("(%p)->() AddRef from %d\n", iface, refCount - 1);
return refCount; return refCount;
} }
@ -411,7 +411,7 @@ ULONG WINAPI InputPin_Release(IPin * iface)
InputPin *This = (InputPin *)iface; InputPin *This = (InputPin *)iface;
ULONG refCount = InterlockedDecrement(&This->pin.refCount); ULONG refCount = InterlockedDecrement(&This->pin.refCount);
TRACE("(%p)->() Release from %ld\n", iface, refCount + 1); TRACE("(%p)->() Release from %d\n", iface, refCount + 1);
if (!refCount) if (!refCount)
{ {
@ -497,7 +497,7 @@ HRESULT WINAPI InputPin_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFERENC
{ {
InputPin *This = (InputPin *)iface; InputPin *This = (InputPin *)iface;
TRACE("(%lx%08lx, %lx%08lx, %e)\n", (ULONG)(tStart >> 32), (ULONG)tStart, (ULONG)(tStop >> 32), (ULONG)tStop, dRate); TRACE("(%x%08x, %x%08x, %e)\n", (ULONG)(tStart >> 32), (ULONG)tStart, (ULONG)(tStop >> 32), (ULONG)tStop, dRate);
This->tStart = tStart; This->tStart = tStart;
This->tStop = tStop; This->tStop = tStop;
@ -670,7 +670,7 @@ ULONG WINAPI OutputPin_Release(IPin * iface)
OutputPin *This = (OutputPin *)iface; OutputPin *This = (OutputPin *)iface;
ULONG refCount = InterlockedDecrement(&This->pin.refCount); ULONG refCount = InterlockedDecrement(&This->pin.refCount);
TRACE("(%p)->() Release from %ld\n", iface, refCount + 1); TRACE("(%p)->() Release from %d\n", iface, refCount + 1);
if (!refCount) if (!refCount)
{ {
@ -748,7 +748,7 @@ HRESULT WINAPI OutputPin_Connect(IPin * iface, IPin * pReceivePin, const AM_MEDI
} /* if succeeded */ } /* if succeeded */
LeaveCriticalSection(This->pin.pCritSec); LeaveCriticalSection(This->pin.pCritSec);
TRACE(" -- %lx\n", hr); TRACE(" -- %x\n", hr);
return hr; return hr;
} }
@ -816,7 +816,7 @@ HRESULT WINAPI OutputPin_EndFlush(IPin * iface)
HRESULT WINAPI OutputPin_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate) HRESULT WINAPI OutputPin_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate)
{ {
TRACE("(%p)->(%lx%08lx, %lx%08lx, %e)\n", iface, (ULONG)(tStart >> 32), (ULONG)tStart, (ULONG)(tStop >> 32), (ULONG)tStop, dRate); TRACE("(%p)->(%x%08x, %x%08x, %e)\n", iface, (ULONG)(tStart >> 32), (ULONG)tStart, (ULONG)(tStop >> 32), (ULONG)tStop, dRate);
/* not supposed to do anything in an output pin */ /* not supposed to do anything in an output pin */
@ -849,7 +849,7 @@ HRESULT OutputPin_GetDeliveryBuffer(OutputPin * This, IMediaSample ** ppSample,
{ {
HRESULT hr; HRESULT hr;
TRACE("(%p, %p, %p, %lx)\n", ppSample, tStart, tStop, dwFlags); TRACE("(%p, %p, %p, %x)\n", ppSample, tStart, tStop, dwFlags);
EnterCriticalSection(This->pin.pCritSec); EnterCriticalSection(This->pin.pCritSec);
{ {
@ -1173,7 +1173,7 @@ static void CALLBACK PullPin_Thread_Process(ULONG_PTR iface)
* it is harder to debug so for the moment it will stay as it is */ * it is harder to debug so for the moment it will stay as it is */
IMediaSample * pSample = NULL; IMediaSample * pSample = NULL;
REFERENCE_TIME rtSampleStop; REFERENCE_TIME rtSampleStop;
DWORD dwUser; DWORD_PTR dwUser;
TRACE("Process sample\n"); TRACE("Process sample\n");
@ -1197,7 +1197,7 @@ static void CALLBACK PullPin_Thread_Process(ULONG_PTR iface)
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
hr = This->fnSampleProc(This->pin.pUserData, pSample); hr = This->fnSampleProc(This->pin.pUserData, pSample);
else else
ERR("Processing error: %lx\n", hr); ERR("Processing error: %x\n", hr);
if (pSample) if (pSample)
IMediaSample_Release(pSample); IMediaSample_Release(pSample);
@ -1221,7 +1221,7 @@ static void CALLBACK PullPin_Thread_Stop(ULONG_PTR iface)
CloseHandle(This->hThread); CloseHandle(This->hThread);
This->hThread = NULL; This->hThread = NULL;
if (FAILED(hr = IMemAllocator_Decommit(This->pAlloc))) if (FAILED(hr = IMemAllocator_Decommit(This->pAlloc)))
ERR("Allocator decommit failed with error %lx. Possible memory leak\n", hr); ERR("Allocator decommit failed with error %x. Possible memory leak\n", hr);
} }
LeaveCriticalSection(This->pin.pCritSec); LeaveCriticalSection(This->pin.pCritSec);
@ -1256,7 +1256,7 @@ HRESULT PullPin_InitProcessing(PullPin * This)
LeaveCriticalSection(This->pin.pCritSec); LeaveCriticalSection(This->pin.pCritSec);
} }
TRACE(" -- %lx\n", hr); TRACE(" -- %x\n", hr);
return hr; return hr;
} }
@ -1313,7 +1313,7 @@ HRESULT PullPin_WaitForStateChange(PullPin * This, DWORD dwMilliseconds)
HRESULT PullPin_Seek(PullPin * This, REFERENCE_TIME rtStart, REFERENCE_TIME rtStop) HRESULT PullPin_Seek(PullPin * This, REFERENCE_TIME rtStart, REFERENCE_TIME rtStop)
{ {
FIXME("(%p)->(%lx%08lx, %lx%08lx)\n", This, (LONG)(rtStart >> 32), (LONG)rtStart, (LONG)(rtStop >> 32), (LONG)rtStop); FIXME("(%p)->(%x%08x, %x%08x)\n", This, (LONG)(rtStart >> 32), (LONG)rtStart, (LONG)(rtStop >> 32), (LONG)rtStop);
PullPin_BeginFlush((IPin *)This); PullPin_BeginFlush((IPin *)This);
/* FIXME: need critical section? */ /* FIXME: need critical section? */

2
dlls/quartz/regsvr.c
View file

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

4
dlls/quartz/systemclock.c
View file

@ -196,7 +196,7 @@ static ULONG WINAPI SystemClockImpl_AddRef(IReferenceClock* iface) {
SystemClockImpl *This = (SystemClockImpl *)iface; SystemClockImpl *This = (SystemClockImpl *)iface;
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p): AddRef from %ld\n", This, ref - 1); TRACE("(%p): AddRef from %d\n", This, ref - 1);
return ref; return ref;
} }
@ -219,7 +219,7 @@ static HRESULT WINAPI SystemClockImpl_QueryInterface(IReferenceClock* iface, REF
static ULONG WINAPI SystemClockImpl_Release(IReferenceClock* iface) { static ULONG WINAPI SystemClockImpl_Release(IReferenceClock* iface) {
SystemClockImpl *This = (SystemClockImpl *)iface; SystemClockImpl *This = (SystemClockImpl *)iface;
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p): ReleaseRef to %ld\n", This, ref); TRACE("(%p): ReleaseRef to %d\n", This, ref);
if (ref == 0) { if (ref == 0) {
if (SystemClockPostMessageToAdviseThread(This, ADVISE_EXIT)) { if (SystemClockPostMessageToAdviseThread(This, ADVISE_EXIT)) {
WaitForSingleObject(This->adviseThread, INFINITE); WaitForSingleObject(This->adviseThread, INFINITE);

14
dlls/quartz/transform.c
View file

@ -67,13 +67,13 @@ static HRESULT TransformFilter_Sample(LPVOID iface, IMediaSample * pSample)
hr = IMediaSample_GetPointer(pSample, &pbSrcStream); hr = IMediaSample_GetPointer(pSample, &pbSrcStream);
if (FAILED(hr)) if (FAILED(hr))
{ {
ERR("Cannot get pointer to sample data (%lx)\n", hr); ERR("Cannot get pointer to sample data (%x)\n", hr);
return hr; return hr;
} }
hr = IMediaSample_GetTime(pSample, &tStart, &tStop); hr = IMediaSample_GetTime(pSample, &tStart, &tStop);
if (FAILED(hr)) if (FAILED(hr))
ERR("Cannot get sample time (%lx)\n", hr); ERR("Cannot get sample time (%x)\n", hr);
cbSrcStream = IMediaSample_GetActualDataLength(pSample); cbSrcStream = IMediaSample_GetActualDataLength(pSample);
@ -214,7 +214,7 @@ HRESULT TransformFilter_Create(TransformFilterImpl* pTransformFilter, const CLSI
hr = TransformFilter_OutputPin_Construct(&piOutput, &props, pTransformFilter, TransformFilter_Output_QueryAccept, &pTransformFilter->csFilter, &pTransformFilter->ppPins[1]); hr = TransformFilter_OutputPin_Construct(&piOutput, &props, pTransformFilter, TransformFilter_Output_QueryAccept, &pTransformFilter->csFilter, &pTransformFilter->ppPins[1]);
if (FAILED(hr)) if (FAILED(hr))
ERR("Cannot create output pin (%lx)\n", hr); ERR("Cannot create output pin (%x)\n", hr);
} }
else else
{ {
@ -258,7 +258,7 @@ static ULONG WINAPI TransformFilter_AddRef(IBaseFilter * iface)
TransformFilterImpl *This = (TransformFilterImpl *)iface; TransformFilterImpl *This = (TransformFilterImpl *)iface;
ULONG refCount = InterlockedIncrement(&This->refCount); ULONG refCount = InterlockedIncrement(&This->refCount);
TRACE("(%p/%p)->() AddRef from %ld\n", This, iface, refCount - 1); TRACE("(%p/%p)->() AddRef from %d\n", This, iface, refCount - 1);
return refCount; return refCount;
} }
@ -268,7 +268,7 @@ static ULONG WINAPI TransformFilter_Release(IBaseFilter * iface)
TransformFilterImpl *This = (TransformFilterImpl *)iface; TransformFilterImpl *This = (TransformFilterImpl *)iface;
ULONG refCount = InterlockedDecrement(&This->refCount); ULONG refCount = InterlockedDecrement(&This->refCount);
TRACE("(%p/%p)->() Release from %ld\n", This, iface, refCount + 1); TRACE("(%p/%p)->() Release from %d\n", This, iface, refCount + 1);
if (!refCount) if (!refCount)
{ {
@ -367,7 +367,7 @@ static HRESULT WINAPI TransformFilter_GetState(IBaseFilter * iface, DWORD dwMill
{ {
TransformFilterImpl *This = (TransformFilterImpl *)iface; TransformFilterImpl *This = (TransformFilterImpl *)iface;
TRACE("(%p/%p)->(%ld, %p)\n", This, iface, dwMilliSecsTimeout, pState); TRACE("(%p/%p)->(%d, %p)\n", This, iface, dwMilliSecsTimeout, pState);
EnterCriticalSection(&This->csFilter); EnterCriticalSection(&This->csFilter);
{ {
@ -519,7 +519,7 @@ static HRESULT WINAPI TransformFilter_InputPin_EndOfStream(IPin * iface)
} }
if (FAILED(hr)) if (FAILED(hr))
ERR("%lx\n", hr); ERR("%x\n", hr);
return hr; return hr;
} }

50
dlls/quartz/videorenderer.c
View file

@ -125,7 +125,7 @@ static LRESULT CALLBACK VideoWndProcA(HWND hwnd, UINT uMsg, WPARAM wParam, LPARA
switch(uMsg) switch(uMsg)
{ {
case WM_SIZING: case WM_SIZING:
/* TRACE("WM_SIZING %ld %ld %ld %ld\n", lprect->left, lprect->top, lprect->right, lprect->bottom); */ /* TRACE("WM_SIZING %d %d %d %d\n", lprect->left, lprect->top, lprect->right, lprect->bottom); */
SetWindowPos(hwnd, NULL, lprect->left, lprect->top, lprect->right - lprect->left, lprect->bottom - lprect->top, SWP_NOZORDER); SetWindowPos(hwnd, NULL, lprect->left, lprect->top, lprect->right - lprect->left, lprect->bottom - lprect->top, SWP_NOZORDER);
GetClientRect(hwnd, &pVideoRenderer->DestRect); GetClientRect(hwnd, &pVideoRenderer->DestRect);
return TRUE; return TRUE;
@ -156,7 +156,7 @@ static BOOL CreateRenderingWindow(VideoRendererImpl* This)
{ {
if (!RegisterClassA(&winclass)) if (!RegisterClassA(&winclass))
{ {
ERR("Unable to register window %lx\n", GetLastError()); ERR("Unable to register window %x\n", GetLastError());
return FALSE; return FALSE;
} }
wnd_class_registered = TRUE; wnd_class_registered = TRUE;
@ -283,7 +283,7 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data,
LPBYTE palette = NULL; LPBYTE palette = NULL;
HDC hDC; HDC hDC;
TRACE("%p %p %ld\n", This, data, size); TRACE("%p %p %d\n", This, data, size);
sdesc.dwSize = sizeof(sdesc); sdesc.dwSize = sizeof(sdesc);
hr = IPin_ConnectionMediaType(This->ppPins[0], &amt); hr = IPin_ConnectionMediaType(This->ppPins[0], &amt);
@ -293,13 +293,13 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data,
} }
format = (VIDEOINFOHEADER*)amt.pbFormat; format = (VIDEOINFOHEADER*)amt.pbFormat;
TRACE("biSize = %ld\n", format->bmiHeader.biSize); TRACE("biSize = %d\n", format->bmiHeader.biSize);
TRACE("biWidth = %ld\n", format->bmiHeader.biWidth); TRACE("biWidth = %d\n", format->bmiHeader.biWidth);
TRACE("biHeigth = %ld\n", format->bmiHeader.biHeight); TRACE("biHeigth = %d\n", format->bmiHeader.biHeight);
TRACE("biPlanes = %d\n", format->bmiHeader.biPlanes); TRACE("biPlanes = %d\n", format->bmiHeader.biPlanes);
TRACE("biBitCount = %d\n", format->bmiHeader.biBitCount); TRACE("biBitCount = %d\n", format->bmiHeader.biBitCount);
TRACE("biCompression = %s\n", debugstr_an((LPSTR)&(format->bmiHeader.biCompression), 4)); TRACE("biCompression = %s\n", debugstr_an((LPSTR)&(format->bmiHeader.biCompression), 4));
TRACE("biSizeImage = %ld\n", format->bmiHeader.biSizeImage); TRACE("biSizeImage = %d\n", format->bmiHeader.biSizeImage);
width = format->bmiHeader.biWidth; width = format->bmiHeader.biWidth;
height = format->bmiHeader.biHeight; height = format->bmiHeader.biHeight;
@ -330,8 +330,8 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data,
return E_FAIL; return E_FAIL;
} }
TRACE("Src Rect: %ld %ld %ld %ld\n", This->SourceRect.left, This->SourceRect.top, This->SourceRect.right, This->SourceRect.bottom); TRACE("Src Rect: %d %d %d %d\n", This->SourceRect.left, This->SourceRect.top, This->SourceRect.right, This->SourceRect.bottom);
TRACE("Dst Rect: %ld %ld %ld %ld\n", This->DestRect.left, This->DestRect.top, This->DestRect.right, This->DestRect.bottom); TRACE("Dst Rect: %d %d %d %d\n", This->DestRect.left, This->DestRect.top, This->DestRect.right, This->DestRect.bottom);
StretchDIBits(hDC, This->DestRect.left, This->DestRect.top, This->DestRect.right -This->DestRect.left, StretchDIBits(hDC, This->DestRect.left, This->DestRect.top, This->DestRect.right -This->DestRect.left,
This->DestRect.bottom - This->DestRect.top, This->SourceRect.left, This->SourceRect.top, This->DestRect.bottom - This->DestRect.top, This->SourceRect.left, This->SourceRect.top,
@ -359,13 +359,13 @@ static HRESULT VideoRenderer_Sample(LPVOID iface, IMediaSample * pSample)
hr = IMediaSample_GetPointer(pSample, &pbSrcStream); hr = IMediaSample_GetPointer(pSample, &pbSrcStream);
if (FAILED(hr)) if (FAILED(hr))
{ {
ERR("Cannot get pointer to sample data (%lx)\n", hr); ERR("Cannot get pointer to sample data (%x)\n", hr);
return hr; return hr;
} }
hr = IMediaSample_GetTime(pSample, &tStart, &tStop); hr = IMediaSample_GetTime(pSample, &tStart, &tStop);
if (FAILED(hr)) if (FAILED(hr))
ERR("Cannot get sample time (%lx)\n", hr); ERR("Cannot get sample time (%x)\n", hr);
cbSrcStream = IMediaSample_GetActualDataLength(pSample); cbSrcStream = IMediaSample_GetActualDataLength(pSample);
@ -506,7 +506,7 @@ static ULONG WINAPI VideoRenderer_AddRef(IBaseFilter * iface)
VideoRendererImpl *This = (VideoRendererImpl *)iface; VideoRendererImpl *This = (VideoRendererImpl *)iface;
ULONG refCount = InterlockedIncrement(&This->refCount); ULONG refCount = InterlockedIncrement(&This->refCount);
TRACE("(%p/%p)->() AddRef from %ld\n", This, iface, refCount - 1); TRACE("(%p/%p)->() AddRef from %d\n", This, iface, refCount - 1);
return refCount; return refCount;
} }
@ -516,7 +516,7 @@ static ULONG WINAPI VideoRenderer_Release(IBaseFilter * iface)
VideoRendererImpl *This = (VideoRendererImpl *)iface; VideoRendererImpl *This = (VideoRendererImpl *)iface;
ULONG refCount = InterlockedDecrement(&This->refCount); ULONG refCount = InterlockedDecrement(&This->refCount);
TRACE("(%p/%p)->() Release from %ld\n", This, iface, refCount + 1); TRACE("(%p/%p)->() Release from %d\n", This, iface, refCount + 1);
if (!refCount) if (!refCount)
{ {
@ -609,7 +609,7 @@ static HRESULT WINAPI VideoRenderer_GetState(IBaseFilter * iface, DWORD dwMilliS
{ {
VideoRendererImpl *This = (VideoRendererImpl *)iface; VideoRendererImpl *This = (VideoRendererImpl *)iface;
TRACE("(%p/%p)->(%ld, %p)\n", This, iface, dwMilliSecsTimeout, pState); TRACE("(%p/%p)->(%d, %p)\n", This, iface, dwMilliSecsTimeout, pState);
EnterCriticalSection(&This->csFilter); EnterCriticalSection(&This->csFilter);
{ {
@ -825,7 +825,7 @@ static HRESULT WINAPI Basicvideo_GetTypeInfo(IBasicVideo *iface,
ITypeInfo**ppTInfo) { ITypeInfo**ppTInfo) {
ICOM_THIS_MULTI(VideoRendererImpl, IBasicVideo_vtbl, iface); ICOM_THIS_MULTI(VideoRendererImpl, IBasicVideo_vtbl, iface);
FIXME("(%p/%p)->(%d, %ld, %p): stub !!!\n", This, iface, iTInfo, lcid, ppTInfo); FIXME("(%p/%p)->(%d, %d, %p): stub !!!\n", This, iface, iTInfo, lcid, ppTInfo);
return S_OK; return S_OK;
} }
@ -838,7 +838,7 @@ static HRESULT WINAPI Basicvideo_GetIDsOfNames(IBasicVideo *iface,
DISPID*rgDispId) { DISPID*rgDispId) {
ICOM_THIS_MULTI(VideoRendererImpl, IBasicVideo_vtbl, iface); ICOM_THIS_MULTI(VideoRendererImpl, IBasicVideo_vtbl, iface);
FIXME("(%p/%p)->(%s (%p), %p, %d, %ld, %p): stub !!!\n", This, iface, debugstr_guid(riid), riid, rgszNames, cNames, lcid, rgDispId); FIXME("(%p/%p)->(%s (%p), %p, %d, %d, %p): stub !!!\n", This, iface, debugstr_guid(riid), riid, rgszNames, cNames, lcid, rgDispId);
return S_OK; return S_OK;
} }
@ -854,7 +854,7 @@ static HRESULT WINAPI Basicvideo_Invoke(IBasicVideo *iface,
UINT*puArgErr) { UINT*puArgErr) {
ICOM_THIS_MULTI(VideoRendererImpl, IBasicVideo_vtbl, iface); ICOM_THIS_MULTI(VideoRendererImpl, IBasicVideo_vtbl, iface);
FIXME("(%p/%p)->(%ld, %s (%p), %ld, %04x, %p, %p, %p, %p): stub !!!\n", This, iface, dispIdMember, debugstr_guid(riid), riid, lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr); FIXME("(%p/%p)->(%d, %s (%p), %d, %04x, %p, %p, %p, %p): stub !!!\n", This, iface, dispIdMember, debugstr_guid(riid), riid, lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr);
return S_OK; return S_OK;
} }
@ -1322,7 +1322,7 @@ static HRESULT WINAPI Videowindow_GetTypeInfo(IVideoWindow *iface,
ITypeInfo**ppTInfo) { ITypeInfo**ppTInfo) {
ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface); ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface);
FIXME("(%p/%p)->(%d, %ld, %p): stub !!!\n", This, iface, iTInfo, lcid, ppTInfo); FIXME("(%p/%p)->(%d, %d, %p): stub !!!\n", This, iface, iTInfo, lcid, ppTInfo);
return S_OK; return S_OK;
} }
@ -1335,7 +1335,7 @@ static HRESULT WINAPI Videowindow_GetIDsOfNames(IVideoWindow *iface,
DISPID*rgDispId) { DISPID*rgDispId) {
ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface); ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface);
FIXME("(%p/%p)->(%s (%p), %p, %d, %ld, %p): stub !!!\n", This, iface, debugstr_guid(riid), riid, rgszNames, cNames, lcid, rgDispId); FIXME("(%p/%p)->(%s (%p), %p, %d, %d, %p): stub !!!\n", This, iface, debugstr_guid(riid), riid, rgszNames, cNames, lcid, rgDispId);
return S_OK; return S_OK;
} }
@ -1351,7 +1351,7 @@ static HRESULT WINAPI Videowindow_Invoke(IVideoWindow *iface,
UINT*puArgErr) { UINT*puArgErr) {
ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface); ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface);
FIXME("(%p/%p)->(%ld, %s (%p), %ld, %04x, %p, %p, %p, %p): stub !!!\n", This, iface, dispIdMember, debugstr_guid(riid), riid, lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr); FIXME("(%p/%p)->(%d, %s (%p), %d, %04x, %p, %p, %p, %p): stub !!!\n", This, iface, dispIdMember, debugstr_guid(riid), riid, lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr);
return S_OK; return S_OK;
} }
@ -1387,7 +1387,7 @@ static HRESULT WINAPI Videowindow_put_WindowStyle(IVideoWindow *iface,
old = GetWindowLongA(This->hWnd, GWL_STYLE); old = GetWindowLongA(This->hWnd, GWL_STYLE);
TRACE("(%p/%p)->(%lx -> %lx)\n", This, iface, old, WindowStyle); TRACE("(%p/%p)->(%x -> %lx)\n", This, iface, old, WindowStyle);
if (WindowStyle & (WS_DISABLED|WS_HSCROLL|WS_ICONIC|WS_MAXIMIZE|WS_MINIMIZE|WS_VSCROLL)) if (WindowStyle & (WS_DISABLED|WS_HSCROLL|WS_ICONIC|WS_MAXIMIZE|WS_MINIMIZE|WS_VSCROLL))
return E_INVALIDARG; return E_INVALIDARG;
@ -1618,7 +1618,7 @@ static HRESULT WINAPI Videowindow_put_Owner(IVideoWindow *iface,
OAHWND Owner) { OAHWND Owner) {
ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface); ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface);
TRACE("(%p/%p)->(%08lx)\n", This, iface, (DWORD) Owner); TRACE("(%p/%p)->(%08x)\n", This, iface, (DWORD) Owner);
SetParent(This->hWnd, (HWND)Owner); SetParent(This->hWnd, (HWND)Owner);
@ -1629,7 +1629,7 @@ static HRESULT WINAPI Videowindow_get_Owner(IVideoWindow *iface,
OAHWND *Owner) { OAHWND *Owner) {
ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface); ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface);
TRACE("(%p/%p)->(%08lx)\n", This, iface, (DWORD) Owner); TRACE("(%p/%p)->(%08x)\n", This, iface, (DWORD) Owner);
*(HWND*)Owner = GetParent(This->hWnd); *(HWND*)Owner = GetParent(This->hWnd);
@ -1640,7 +1640,7 @@ static HRESULT WINAPI Videowindow_put_MessageDrain(IVideoWindow *iface,
OAHWND Drain) { OAHWND Drain) {
ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface); ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface);
TRACE("(%p/%p)->(%08lx)\n", This, iface, (DWORD) Drain); TRACE("(%p/%p)->(%08x)\n", This, iface, (DWORD) Drain);
This->hWndMsgDrain = (HWND)Drain; This->hWndMsgDrain = (HWND)Drain;
@ -1728,7 +1728,7 @@ static HRESULT WINAPI Videowindow_NotifyOwnerMessage(IVideoWindow *iface,
LONG_PTR lParam) { LONG_PTR lParam) {
ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface); ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface);
TRACE("(%p/%p)->(%08lx, %ld, %08lx, %08lx)\n", This, iface, (DWORD) hwnd, uMsg, wParam, lParam); TRACE("(%p/%p)->(%08x, %ld, %08lx, %08lx)\n", This, iface, (DWORD) hwnd, uMsg, wParam, lParam);
if (!PostMessageA(This->hWnd, uMsg, wParam, lParam)) if (!PostMessageA(This->hWnd, uMsg, wParam, lParam))
return E_FAIL; return E_FAIL;

6
dlls/quartz/waveparser.c
View file

@ -95,7 +95,7 @@ static HRESULT WAVEParser_Sample(LPVOID iface, IMediaSample * pSample)
} }
else else
{ {
TRACE("Skipping sending sample due to error (%lx)\n", hr); TRACE("Skipping sending sample due to error (%x)\n", hr);
This->pCurrentSample = NULL; This->pCurrentSample = NULL;
break; break;
} }
@ -147,7 +147,7 @@ static HRESULT WAVEParser_Sample(LPVOID iface, IMediaSample * pSample)
hr = OutputPin_SendSample(&pOutputPin->pin, This->pCurrentSample); hr = OutputPin_SendSample(&pOutputPin->pin, This->pCurrentSample);
if (hr != S_OK && hr != VFW_E_NOT_CONNECTED) if (hr != S_OK && hr != VFW_E_NOT_CONNECTED)
ERR("Error sending sample (%lx)\n", hr); ERR("Error sending sample (%x)\n", hr);
} }
if (This->pCurrentSample) if (This->pCurrentSample)
@ -188,7 +188,7 @@ static HRESULT WAVEParser_Sample(LPVOID iface, IMediaSample * pSample)
} }
if (FAILED(hr)) if (FAILED(hr))
{ {
ERR("%lx\n", hr); ERR("%x\n", hr);
break; break;
} }
} }