quartz: Win64 printf format warning fixes.
diff --git a/dlls/quartz/Makefile.in b/dlls/quartz/Makefile.in
index 8f0e937..b9870ed 100644
--- a/dlls/quartz/Makefile.in
+++ b/dlls/quartz/Makefile.in
@@ -6,7 +6,6 @@
IMPORTLIB = libquartz.$(IMPLIBEXT)
IMPORTS = dsound msacm32 msvfw32 ole32 oleaut32 user32 gdi32 advapi32 kernel32
EXTRALIBS = -lstrmiids -luuid
-EXTRADEFS = -DWINE_NO_LONG_AS_INT
C_SRCS = \
acmwrapper.c \
diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c
index f514f25..2b25880 100644
--- a/dlls/quartz/acmwrapper.c
+++ b/dlls/quartz/acmwrapper.c
@@ -73,7 +73,7 @@
BOOL unprepare_header = FALSE;
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);
if (FAILED(hr)) {
@@ -98,7 +98,7 @@
hr = OutputPin_GetDeliveryBuffer((OutputPin*)This->tf.ppPins[1], &pSample, NULL, NULL, 0);
if (FAILED(hr)) {
- ERR("Unable to get delivery buffer (%lx)\n", hr);
+ ERR("Unable to get delivery buffer (%x)\n", hr);
goto error;
}
@@ -107,7 +107,7 @@
hr = IMediaSample_GetPointer(pSample, &pbDstStream);
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;
}
cbDstStream = IMediaSample_GetSize(pSample);
@@ -133,7 +133,7 @@
}
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);
assert(hr == S_OK);
@@ -147,7 +147,7 @@
hr = OutputPin_SendSample((OutputPin*)This->tf.ppPins[1], pSample);
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;
}
@@ -202,7 +202,7 @@
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 */
((OutputPin*)This->tf.ppPins[1])->allocProps.cbBuffer = OUTPUT_BUFFER_SIZE;
diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c
index 8e7a6a0..c4f8c54 100644
--- a/dlls/quartz/avidec.c
+++ b/dlls/quartz/avidec.c
@@ -66,7 +66,7 @@
result = ICDecompressBegin(This->hvid, This->pBihIn, This->pBihOut);
if (result != ICERR_OK)
{
- ERR("Cannot start processing (%ld)\n", result);
+ ERR("Cannot start processing (%d)\n", result);
return E_FAIL;
}
return S_OK;
@@ -83,7 +83,7 @@
DWORD cbDstStream;
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);
if (FAILED(hr)) {
@@ -97,7 +97,7 @@
hr = OutputPin_GetDeliveryBuffer((OutputPin*)This->tf.ppPins[1], &pSample, NULL, NULL, 0);
if (FAILED(hr)) {
- ERR("Unable to get delivery buffer (%lx)\n", hr);
+ ERR("Unable to get delivery buffer (%x)\n", hr);
goto error;
}
@@ -106,23 +106,23 @@
hr = IMediaSample_GetPointer(pSample, &pbDstStream);
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;
}
cbDstStream = IMediaSample_GetSize(pSample);
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;
goto error;
}
res = ICDecompress(This->hvid, 0, This->pBihIn, data, This->pBihOut, pbDstStream);
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);
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;
}
@@ -143,7 +143,7 @@
result = ICDecompressEnd(This->hvid);
if (result != ICERR_OK)
{
- ERR("Cannot stop processing (%ld)\n", result);
+ ERR("Cannot stop processing (%d)\n", result);
return E_FAIL;
}
return S_OK;
@@ -212,7 +212,7 @@
result = ICDecompressQuery(This->hvid, This->pBihIn, This->pBihOut);
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;
}
diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c
index f1eff89..68a91ff 100644
--- a/dlls/quartz/avisplit.c
+++ b/dlls/quartz/avisplit.c
@@ -175,7 +175,7 @@
FIXME("handle palette change\n");
break;
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))
bMoreData = FALSE;
continue;
@@ -187,7 +187,7 @@
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;
break;
}
@@ -207,7 +207,7 @@
}
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;
if (S_FALSE == AVISplitter_NextChunk(&This->CurrentChunkOffset, &This->CurrentChunk, &tStart, &tStop, pbSrcStream, FALSE))
bMoreData = FALSE;
@@ -227,7 +227,7 @@
assert(chunk_remaining_bytes <= cbDstStream - IMediaSample_GetActualDataLength(This->pCurrentSample));
/* 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)
@@ -264,7 +264,7 @@
hr = OutputPin_SendSample(&pOutputPin->pin, This->pCurrentSample);
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)
@@ -308,7 +308,7 @@
}
if (FAILED(hr))
{
- ERR("%lx\n", hr);
+ ERR("%x\n", hr);
break;
}
}
@@ -455,8 +455,8 @@
dump_AM_MEDIA_TYPE(&amt);
TRACE("fSamplesPerSec = %f\n", (double)fSamplesPerSec);
- TRACE("dwSampleSize = %lx\n", dwSampleSize);
- TRACE("dwLength = %lx\n", dwLength);
+ TRACE("dwSampleSize = %x\n", dwSampleSize);
+ TRACE("dwLength = %x\n", dwLength);
hr = Parser_AddPin(&(This->Parser), &piOutput, &props, &amt, fSamplesPerSec, dwSampleSize, dwLength);
diff --git a/dlls/quartz/control.c b/dlls/quartz/control.c
index 3b16cca..5f13df6 100644
--- a/dlls/quartz/control.c
+++ b/dlls/quartz/control.c
@@ -186,7 +186,7 @@
BOOL bChangeStart = FALSE, bChangeStop = FALSE;
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);
llNewStop = Adjust(This->llStop, pStop, dwStopFlags);
diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c
index dfc285f..693d355 100644
--- a/dlls/quartz/dsoundrender.c
+++ b/dlls/quartz/dsoundrender.c
@@ -118,15 +118,15 @@
TRACE("MajorType %s\n", debugstr_guid(&amt.majortype));
TRACE("SubType %s\n", debugstr_guid(&amt.subtype));
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);
format = (WAVEFORMATEX*)amt.pbFormat;
TRACE("wFormatTag = %x %x\n", format->wFormatTag, WAVE_FORMAT_PCM);
TRACE("nChannels = %d\n", format->nChannels);
- TRACE("nSamplesPerSec = %lu\n", format->nSamplesPerSec);
- TRACE("nAvgBytesPerSec = %lu\n", format->nAvgBytesPerSec);
+ TRACE("nSamplesPerSec = %u\n", format->nSamplesPerSec);
+ TRACE("nAvgBytesPerSec = %u\n", format->nAvgBytesPerSec);
TRACE("nBlockAlign = %d\n", format->nBlockAlign);
TRACE("wBitsPerSample = %d\n", format->wBitsPerSample);
TRACE("cbSize = %d\n", format->cbSize);
@@ -171,7 +171,7 @@
hr = IDirectSoundBuffer_GetCurrentPosition(This->dsbuffer, &play_pos, NULL);
if (hr != DS_OK)
{
- ERR("Error GetCurrentPosition: %lx\n", hr);
+ ERR("Error GetCurrentPosition: %x\n", hr);
break;
}
if (This->write_pos < play_pos)
@@ -189,10 +189,10 @@
size2 = min(buf_free, size);
hr = IDirectSoundBuffer_Lock(This->dsbuffer, This->write_pos, size2, &lpbuf1, &dwsize1, &lpbuf2, &dwsize2, 0);
if (hr != DS_OK) {
- ERR("Unable to lock sound buffer! (%lx)\n", hr);
+ ERR("Unable to lock sound buffer! (%x)\n", hr);
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);
if (dwsize2)
@@ -200,14 +200,14 @@
hr = IDirectSoundBuffer_Unlock(This->dsbuffer, lpbuf1, dwsize1, lpbuf2, dwsize2);
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)
{
hr = IDirectSoundBuffer_Play(This->dsbuffer, 0, 0, DSBPLAY_LOOPING);
if (hr == DS_OK)
This->started = TRUE;
else
- ERR("Can't start playing! (%lx)\n", hr);
+ ERR("Can't start playing! (%x)\n", hr);
}
size -= dwsize1 + dwsize2;
data += dwsize1 + dwsize2;
@@ -234,13 +234,13 @@
hr = IMediaSample_GetPointer(pSample, &pbSrcStream);
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;
}
hr = IMediaSample_GetTime(pSample, &tStart, &tStop);
if (FAILED(hr))
- ERR("Cannot get sample time (%lx)\n", hr);
+ ERR("Cannot get sample time (%x)\n", hr);
cbSrcStream = IMediaSample_GetActualDataLength(pSample);
@@ -281,8 +281,8 @@
WAVEFORMATEX* format = (WAVEFORMATEX*)pmt->pbFormat;
TRACE("wFormatTag = %x %x\n", format->wFormatTag, WAVE_FORMAT_PCM);
TRACE("nChannels = %d\n", format->nChannels);
- TRACE("nSamplesPerSec = %ld\n", format->nAvgBytesPerSec);
- TRACE("nAvgBytesPerSec = %ld\n", format->nAvgBytesPerSec);
+ TRACE("nSamplesPerSec = %d\n", format->nAvgBytesPerSec);
+ TRACE("nAvgBytesPerSec = %d\n", format->nAvgBytesPerSec);
TRACE("nBlockAlign = %d\n", format->nBlockAlign);
TRACE("wBitsPerSample = %d\n", format->wBitsPerSample);
@@ -373,7 +373,7 @@
DSoundRenderImpl *This = (DSoundRenderImpl *)iface;
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;
}
@@ -383,7 +383,7 @@
DSoundRenderImpl *This = (DSoundRenderImpl *)iface;
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)
{
@@ -473,7 +473,7 @@
{
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);
{
@@ -703,7 +703,7 @@
ITypeInfo**ppTInfo) {
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;
}
@@ -716,7 +716,7 @@
DISPID*rgDispId) {
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;
}
@@ -732,7 +732,7 @@
UINT*puArgErr) {
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;
}
diff --git a/dlls/quartz/enumfilters.c b/dlls/quartz/enumfilters.c
index 214f1cd4..663451f 100644
--- a/dlls/quartz/enumfilters.c
+++ b/dlls/quartz/enumfilters.c
@@ -41,7 +41,7 @@
* they should have been previously AddRef'd. */
IEnumFiltersImpl * pEnumFilters = CoTaskMemAlloc(sizeof(IEnumFiltersImpl));
- TRACE("(%p, %ld, %p)\n", ppFilters, nFilters, ppEnum);
+ TRACE("(%p, %d, %p)\n", ppFilters, nFilters, ppEnum);
*ppEnum = NULL;
@@ -124,7 +124,7 @@
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++)
{
@@ -146,7 +146,7 @@
{
IEnumFiltersImpl *This = (IEnumFiltersImpl *)iface;
- TRACE("(%p)->(%lu)\n", iface, cFilters);
+ TRACE("(%p)->(%u)\n", iface, cFilters);
if (This->uIndex + cFilters < This->nFilters)
{
diff --git a/dlls/quartz/enummedia.c b/dlls/quartz/enummedia.c
index 34f46ef..2f207d6 100644
--- a/dlls/quartz/enummedia.c
+++ b/dlls/quartz/enummedia.c
@@ -154,7 +154,7 @@
IEnumMediaTypesImpl *This = (IEnumMediaTypesImpl *)iface;
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;
}
@@ -164,7 +164,7 @@
IEnumMediaTypesImpl *This = (IEnumMediaTypesImpl *)iface;
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)
{
@@ -185,8 +185,8 @@
cFetched = min(This->enumMediaDetails.cMediaTypes, This->uIndex + cMediaTypes) - This->uIndex;
- TRACE("(%lu, %p, %p)\n", cMediaTypes, ppMediaTypes, pcFetched);
- TRACE("Next uIndex: %lu, cFetched: %lu\n", This->uIndex, cFetched);
+ TRACE("(%u, %p, %p)\n", cMediaTypes, ppMediaTypes, pcFetched);
+ TRACE("Next uIndex: %u, cFetched: %u\n", This->uIndex, cFetched);
if (cFetched > 0)
{
@@ -215,7 +215,7 @@
{
IEnumMediaTypesImpl *This = (IEnumMediaTypesImpl *)iface;
- TRACE("(%lu)\n", cMediaTypes);
+ TRACE("(%u)\n", cMediaTypes);
if (This->uIndex + cMediaTypes < This->enumMediaDetails.cMediaTypes)
{
diff --git a/dlls/quartz/enummoniker.c b/dlls/quartz/enummoniker.c
index 3afb51a..64da70b 100644
--- a/dlls/quartz/enummoniker.c
+++ b/dlls/quartz/enummoniker.c
@@ -50,7 +50,7 @@
* IMonikers */
EnumMonikerImpl * pemi = CoTaskMemAlloc(sizeof(EnumMonikerImpl));
- TRACE("(%p, %ld, %p)\n", ppMoniker, nMonikerCount, ppEnum);
+ TRACE("(%p, %d, %p)\n", ppMoniker, nMonikerCount, ppEnum);
*ppEnum = NULL;
@@ -106,7 +106,7 @@
ref = InterlockedIncrement(&This->ref);
- TRACE("(%p)->() AddRef from %ld\n", iface, ref - 1);
+ TRACE("(%p)->() AddRef from %d\n", iface, ref - 1);
return ref;
}
@@ -119,7 +119,7 @@
EnumMonikerImpl *This = (EnumMonikerImpl *)iface;
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)
{
@@ -136,7 +136,7 @@
ULONG fetched;
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++)
{
@@ -146,7 +146,7 @@
This->index += fetched;
- TRACE("-- fetched %ld\n", fetched);
+ TRACE("-- fetched %d\n", fetched);
if (pceltFetched)
*pceltFetched = fetched;
@@ -161,7 +161,7 @@
{
EnumMonikerImpl *This = (EnumMonikerImpl *)iface;
- TRACE("(%p)->(%ld)\n", iface, celt);
+ TRACE("(%p)->(%d)\n", iface, celt);
This->index += celt;
diff --git a/dlls/quartz/enumpins.c b/dlls/quartz/enumpins.c
index 8649db9..2a4b8f9 100644
--- a/dlls/quartz/enumpins.c
+++ b/dlls/quartz/enumpins.c
@@ -105,7 +105,7 @@
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)
{
@@ -130,7 +130,7 @@
{
IEnumPinsImpl *This = (IEnumPinsImpl *)iface;
- TRACE("(%lu)\n", cPins);
+ TRACE("(%u)\n", cPins);
if (This->uIndex + cPins < This->enumPinDetails.cPins)
{
diff --git a/dlls/quartz/enumregfilters.c b/dlls/quartz/enumregfilters.c
index 9910839..2e93c7b 100644
--- a/dlls/quartz/enumregfilters.c
+++ b/dlls/quartz/enumregfilters.c
@@ -43,7 +43,7 @@
REGFILTER* pRegFilters = NULL;
unsigned int i;
- TRACE("(%p, %ld, %p)\n", pInRegFilters, size, ppEnum);
+ TRACE("(%p, %d, %p)\n", pInRegFilters, size, ppEnum);
pEnumRegFilters = CoTaskMemAlloc(sizeof(IEnumRegFiltersImpl));
if (!pEnumRegFilters)
@@ -145,7 +145,7 @@
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)
{
@@ -178,7 +178,7 @@
static HRESULT WINAPI IEnumRegFiltersImpl_Skip(IEnumRegFilters * iface, ULONG n)
{
- TRACE("(%p)->(%lu)\n", iface, n);
+ TRACE("(%p)->(%u)\n", iface, n);
return E_NOTIMPL;
}
diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c
index 23fb1fb..786252f 100644
--- a/dlls/quartz/filesource.c
+++ b/dlls/quartz/filesource.c
@@ -362,7 +362,7 @@
AsyncReader *This = (AsyncReader *)iface;
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;
}
@@ -372,7 +372,7 @@
AsyncReader *This = (AsyncReader *)iface;
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)
{
@@ -426,7 +426,7 @@
{
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;
@@ -437,7 +437,7 @@
{
AsyncReader *This = (AsyncReader *)iface;
- TRACE("(%lu, %p)\n", dwMilliSecsTimeout, pState);
+ TRACE("(%u, %p)\n", dwMilliSecsTimeout, pState);
*pState = This->state;
@@ -828,7 +828,7 @@
FreeMediaType(&This->pin.mtCurrent);
}
- TRACE(" -- %lx\n", hr);
+ TRACE(" -- %x\n", hr);
return hr;
}
@@ -908,7 +908,7 @@
{
IMemAllocator_AddRef(pPreferred);
*ppActual = pPreferred;
- TRACE("FileAsyncReader_RequestAllocator -- %lx\n", hr);
+ TRACE("FileAsyncReader_RequestAllocator -- %x\n", hr);
return S_OK;
}
}
@@ -926,7 +926,7 @@
{
IMemAllocator_AddRef(pPreferred);
*ppActual = pPreferred;
- TRACE("FileAsyncReader_RequestAllocator -- %lx\n", hr);
+ TRACE("FileAsyncReader_RequestAllocator -- %x\n", hr);
return S_OK;
}
}
@@ -938,7 +938,7 @@
IMemAllocator_Release(pPreferred);
}
- TRACE("-- %lx\n", hr);
+ TRACE("-- %x\n", hr);
return hr;
}
@@ -1021,7 +1021,7 @@
CoTaskMemFree(pDataRq);
}
- TRACE("-- %lx\n", hr);
+ TRACE("-- %x\n", hr);
return hr;
}
@@ -1031,7 +1031,7 @@
DATAREQUEST * pDataRq = NULL;
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
* and then determining which one finished and removing that from the list, otherwise
@@ -1081,7 +1081,7 @@
/* no need to close event handle since we will close it when the pin is destroyed */
CoTaskMemFree(pDataRq);
- TRACE("-- %lx\n", hr);
+ TRACE("-- %x\n", hr);
return hr;
}
@@ -1107,7 +1107,7 @@
(LONG) BYTES_FROM_MEDIATIME(tStop - tStart),
pBuffer);
- TRACE("-- %lx\n", hr);
+ TRACE("-- %x\n", hr);
return hr;
}
@@ -1117,7 +1117,7 @@
HRESULT hr = S_OK;
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));
@@ -1142,7 +1142,7 @@
CloseHandle(ovl.hEvent);
- TRACE("-- %lx\n", hr);
+ TRACE("-- %x\n", hr);
return hr;
}
diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c
index 1dcff3e..b01932a 100644
--- a/dlls/quartz/filtergraph.c
+++ b/dlls/quartz/filtergraph.c
@@ -246,7 +246,7 @@
static ULONG Filtergraph_AddRef(IFilterGraphImpl *This) {
ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p)->(): new ref = %ld\n", This, ref);
+ TRACE("(%p)->(): new ref = %d\n", This, ref);
return ref;
}
@@ -254,7 +254,7 @@
static ULONG Filtergraph_Release(IFilterGraphImpl *This) {
ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(): new ref = %ld\n", This, ref);
+ TRACE("(%p)->(): new ref = %d\n", This, ref);
if (ref == 0) {
int i;
@@ -524,7 +524,7 @@
IPin_QueryDirection(ppin, &pindir);
hr = IPin_ConnectedTo(ppin, &pConnectedTo);
if (FAILED(hr)) {
- TRACE("Querying connected to failed: %lx\n", hr);
+ TRACE("Querying connected to failed: %x\n", hr);
return hr;
}
IPin_Disconnect(ppin);
@@ -536,7 +536,7 @@
IPin_Release(pConnectedTo);
if (FAILED(hr))
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;
}
@@ -600,7 +600,7 @@
*pppins = CoTaskMemAlloc(sizeof(IPin*)*nb);
hr = IPin_QueryInternalConnections(pinputpin, *pppins, &nb);
if (hr != S_OK) {
- ERR("Error (%lx)\n", hr);
+ ERR("Error (%x)\n", hr);
}
} else if (hr == E_NOTIMPL) {
/* Input connected to all outputs */
@@ -610,7 +610,7 @@
TRACE("E_NOTIMPL\n");
hr = IBaseFilter_EnumPins(pfilter, &penumpins);
if (FAILED(hr)) {
- ERR("filter Enumpins failed (%lx)\n", hr);
+ ERR("filter Enumpins failed (%x)\n", hr);
return hr;
}
i = 0;
@@ -636,12 +636,12 @@
}
nb = i;
if (FAILED(hr)) {
- ERR("Next failed (%lx)\n", hr);
+ ERR("Next failed (%x)\n", hr);
return hr;
}
IEnumPins_Release(penumpins);
} else if (FAILED(hr)) {
- ERR("Cannot get internal connection (%lx)\n", hr);
+ ERR("Cannot get internal connection (%x)\n", hr);
return hr;
}
@@ -707,13 +707,13 @@
* filter to the minor mediatype of input pin of the renderer */
hr = IPin_EnumMediaTypes(ppinOut, &penummt);
if (FAILED(hr)) {
- ERR("EnumMediaTypes (%lx)\n", hr);
+ ERR("EnumMediaTypes (%x)\n", hr);
return hr;
}
hr = IEnumMediaTypes_Next(penummt, 1, &mt, &nbmt);
if (FAILED(hr)) {
- ERR("IEnumMediaTypes_Next (%lx)\n", hr);
+ ERR("IEnumMediaTypes_Next (%x)\n", hr);
return hr;
}
@@ -729,7 +729,7 @@
tab[1] = mt->subtype;
hr = IFilterMapper2_EnumMatchingFilters(This->pFilterMapper2, &pEnumMoniker, 0, FALSE, 0, TRUE, 1, tab, NULL, NULL, FALSE, FALSE, 0, NULL, NULL, NULL);
if (FAILED(hr)) {
- ERR("Unable to enum filters (%lx)\n", hr);
+ ERR("Unable to enum filters (%x)\n", hr);
return hr;
}
@@ -744,7 +744,7 @@
hr = GetFilterInfo(pMoniker, &clsid, &var);
IMoniker_Release(pMoniker);
if (FAILED(hr)) {
- ERR("Unable to retrieve filter info (%lx)\n", hr);
+ ERR("Unable to retrieve filter info (%x)\n", hr);
goto error;
}
@@ -755,13 +755,13 @@
hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)&pfilter);
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;
}
hr = IGraphBuilder_AddFilter(iface, pfilter, NULL);
if (FAILED(hr)) {
- ERR("Unable to add filter (%lx)\n", hr);
+ ERR("Unable to add filter (%x)\n", hr);
IBaseFilter_Release(pfilter);
pfilter = NULL;
goto error;
@@ -769,13 +769,13 @@
hr = IBaseFilter_EnumPins(pfilter, &penumpins);
if (FAILED(hr)) {
- ERR("Enumpins (%lx)\n", hr);
+ ERR("Enumpins (%x)\n", hr);
goto error;
}
hr = IEnumPins_Next(penumpins, 1, &ppinfilter, &pin);
if (FAILED(hr)) {
- ERR("Next (%lx)\n", hr);
+ ERR("Next (%x)\n", hr);
goto error;
}
if (pin == 0) {
@@ -786,7 +786,7 @@
hr = IPin_Connect(ppinOut, ppinfilter, NULL);
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;
}
TRACE("Successfully connected to filter, follow chain...\n");
@@ -796,12 +796,12 @@
if (SUCCEEDED(hr)) {
int i;
- TRACE("pins to consider: %ld\n", nb);
+ TRACE("pins to consider: %d\n", nb);
for(i = 0; i < nb; i++) {
TRACE("Processing pin %d\n", i);
hr = IGraphBuilder_Connect(iface, ppins[i], ppinIn);
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]);
if (SUCCEEDED(hr)) break;
@@ -856,7 +856,7 @@
hr = IPin_EnumMediaTypes(ppinOut, &penummt);
if (FAILED(hr)) {
- ERR("EnumMediaTypes (%lx)\n", hr);
+ ERR("EnumMediaTypes (%x)\n", hr);
return hr;
}
@@ -864,7 +864,7 @@
{
hr = IEnumMediaTypes_Next(penummt, 1, &mt, &nbmt);
if (FAILED(hr)) {
- ERR("IEnumMediaTypes_Next (%lx)\n", hr);
+ ERR("IEnumMediaTypes_Next (%x)\n", hr);
return hr;
}
if (!nbmt)
@@ -877,7 +877,7 @@
tab[1] = GUID_NULL;
hr = IFilterMapper2_EnumMatchingFilters(This->pFilterMapper2, &pEnumMoniker, 0, FALSE, 0, TRUE, 1, tab, NULL, NULL, TRUE, FALSE, 0, NULL, NULL, NULL);
if (FAILED(hr)) {
- ERR("Unable to enum filters (%lx)\n", hr);
+ ERR("Unable to enum filters (%x)\n", hr);
return hr;
}
@@ -893,31 +893,31 @@
hr = GetFilterInfo(pMoniker, &clsid, &var);
IMoniker_Release(pMoniker);
if (FAILED(hr)) {
- ERR("Unable to retrieve filter info (%lx)\n", hr);
+ ERR("Unable to retrieve filter info (%x)\n", hr);
goto error;
}
hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)&pfilter);
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;
}
hr = IGraphBuilder_AddFilter(iface, pfilter, NULL);
if (FAILED(hr)) {
- ERR("Unable to add filter (%lx)\n", hr);
+ ERR("Unable to add filter (%x)\n", hr);
pfilter = NULL;
goto error;
}
hr = IBaseFilter_EnumPins(pfilter, &penumpins);
if (FAILED(hr)) {
- ERR("Splitter Enumpins (%lx)\n", hr);
+ ERR("Splitter Enumpins (%x)\n", hr);
goto error;
}
hr = IEnumPins_Next(penumpins, 1, &ppinfilter, &pin);
if (FAILED(hr)) {
- ERR("Next (%lx)\n", hr);
+ ERR("Next (%x)\n", hr);
goto error;
}
if (pin == 0) {
@@ -929,7 +929,7 @@
/* Connect the pin to render to the renderer */
hr = IGraphBuilder_Connect(iface, ppinOut, ppinfilter);
if (FAILED(hr)) {
- TRACE("Unable to connect to renderer (%lx)\n", hr);
+ TRACE("Unable to connect to renderer (%x)\n", hr);
goto error;
}
break;
@@ -1007,19 +1007,19 @@
hr = GetFilterInfo(pMoniker, &clsid, &var);
IMoniker_Release(pMoniker);
if (FAILED(hr)) {
- ERR("Unable to retrieve filter info (%lx)\n", hr);
+ ERR("Unable to retrieve filter info (%x)\n", hr);
continue;
}
hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)&psplitter);
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;
}
hr = IGraphBuilder_AddFilter(iface, psplitter, NULL);
if (FAILED(hr)) {
- ERR("Unable add filter (%lx)\n", hr);
+ ERR("Unable add filter (%x)\n", hr);
return hr;
}
@@ -1027,12 +1027,12 @@
/* Make the splitter analyze incoming data */
hr = IBaseFilter_EnumPins(preader, &penumpins);
if (FAILED(hr)) {
- ERR("Enumpins (%lx)\n", hr);
+ ERR("Enumpins (%x)\n", hr);
return hr;
}
hr = IEnumPins_Next(penumpins, 1, &ppinreader, &pin);
if (FAILED(hr)) {
- ERR("Next (%lx)\n", hr);
+ ERR("Next (%x)\n", hr);
return hr;
}
if (pin == 0) {
@@ -1043,12 +1043,12 @@
hr = IBaseFilter_EnumPins(psplitter, &penumpins);
if (FAILED(hr)) {
- ERR("Splitter Enumpins (%lx)\n", hr);
+ ERR("Splitter Enumpins (%x)\n", hr);
return hr;
}
hr = IEnumPins_Next(penumpins, 1, &ppinsplitter, &pin);
if (FAILED(hr)) {
- ERR("Next (%lx)\n", hr);
+ ERR("Next (%x)\n", hr);
return hr;
}
if (pin == 0) {
@@ -1061,7 +1061,7 @@
if (FAILED(hr)) {
IBaseFilter_Release(ppinsplitter);
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;
}
TRACE("Successfully connected to filter\n");
@@ -1074,12 +1074,12 @@
if (SUCCEEDED(hr)) {
int i;
- TRACE("pins to consider: %ld\n", nb);
+ TRACE("pins to consider: %d\n", nb);
for(i = 0; i < nb; i++) {
TRACE("Processing pin %d\n", i);
hr = IGraphBuilder_Render(iface, ppins[i]);
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 */
break;
}
@@ -1106,33 +1106,33 @@
/* Instantiate a file source filter */
hr = CoCreateInstance(&CLSID_AsyncReader, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)&preader);
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;
}
hr = IGraphBuilder_AddFilter(iface, preader, lpcwstrFilterName);
if (FAILED(hr)) {
- ERR("Unable add filter (%lx)\n", hr);
+ ERR("Unable add filter (%x)\n", hr);
IBaseFilter_Release(preader);
return hr;
}
hr = IBaseFilter_QueryInterface(preader, &IID_IFileSourceFilter, (LPVOID*)&pfile);
if (FAILED(hr)) {
- ERR("Unable to get IFileSourceInterface (%lx)\n", hr);
+ ERR("Unable to get IFileSourceInterface (%x)\n", hr);
goto error;
}
/* Load the file in the file source filter */
hr = IFileSourceFilter_Load(pfile, lpcwstrFileName, NULL);
if (FAILED(hr)) {
- ERR("Load (%lx)\n", hr);
+ ERR("Load (%x)\n", hr);
goto error;
}
IFileSourceFilter_GetCurFile(pfile, &filename, &mt);
if (FAILED(hr)) {
- ERR("GetCurFile (%lx)\n", hr);
+ ERR("GetCurFile (%x)\n", hr);
goto error;
}
TRACE("File %s\n", debugstr_w(filename));
@@ -1157,7 +1157,7 @@
DWORD_PTR hFile) {
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;
}
@@ -1245,7 +1245,7 @@
ITypeInfo**ppTInfo) {
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;
}
@@ -1258,7 +1258,7 @@
DISPID*rgDispId) {
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;
}
@@ -1274,7 +1274,7 @@
UINT*puArgErr) {
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;
}
@@ -1365,7 +1365,7 @@
hr = IBaseFilter_EnumPins(pfilter, &pEnum);
if (hr != S_OK)
{
- ERR("Enum pins failed %lx\n", hr);
+ ERR("Enum pins failed %x\n", hr);
continue;
}
/* Check if it is a source filter */
@@ -1443,7 +1443,7 @@
OAFilterState *pfs) {
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);
@@ -1659,7 +1659,7 @@
DWORD dwStopFlags) {
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;
}
@@ -1837,7 +1837,7 @@
IBasicAudio* pBasicAudio;
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);
@@ -1861,7 +1861,7 @@
IBasicAudio* pBasicAudio;
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);
@@ -1888,7 +1888,7 @@
IBasicAudio* pBasicAudio;
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);
@@ -2054,7 +2054,7 @@
IBasicVideo* pBasicVideo;
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);
@@ -2078,7 +2078,7 @@
IBasicVideo* pBasicVideo;
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);
@@ -2105,7 +2105,7 @@
IBasicVideo* pBasicVideo;
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);
@@ -2874,7 +2874,7 @@
IVideoWindow* pVideoWindow;
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);
@@ -2898,7 +2898,7 @@
IVideoWindow* pVideoWindow;
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);
@@ -2925,7 +2925,7 @@
IVideoWindow* pVideoWindow;
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);
@@ -3387,7 +3387,7 @@
IVideoWindow* pVideoWindow;
HRESULT hr;
- TRACE("(%p/%p)->(%08lx)\n", This, iface, (DWORD) Owner);
+ TRACE("(%p/%p)->(%08x)\n", This, iface, (DWORD) Owner);
EnterCriticalSection(&This->cs);
@@ -3427,7 +3427,7 @@
IVideoWindow* pVideoWindow;
HRESULT hr;
- TRACE("(%p/%p)->(%08lx)\n", This, iface, (DWORD) Drain);
+ TRACE("(%p/%p)->(%08x)\n", This, iface, (DWORD) Drain);
EnterCriticalSection(&This->cs);
@@ -3570,7 +3570,7 @@
IVideoWindow* pVideoWindow;
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);
@@ -3830,7 +3830,7 @@
ITypeInfo**ppTInfo) {
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;
}
@@ -3843,7 +3843,7 @@
DISPID*rgDispId) {
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;
}
@@ -3859,7 +3859,7 @@
UINT*puArgErr) {
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;
}
@@ -3965,7 +3965,7 @@
LONG_PTR lInstanceData) {
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.msg = lMsg;
@@ -4075,7 +4075,7 @@
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;
}
@@ -4215,7 +4215,7 @@
{
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;
}
@@ -4228,7 +4228,7 @@
{
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;
}
@@ -4291,7 +4291,7 @@
{
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;
}
@@ -4313,7 +4313,7 @@
{
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;
}
@@ -4377,7 +4377,7 @@
hr = CoCreateInstance(&CLSID_FilterMapper, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterMapper2, (LPVOID*)&fimpl->pFilterMapper2);
if (FAILED(hr)) {
- ERR("Unable to create filter mapper (%lx)\n", hr);
+ ERR("Unable to create filter mapper (%x)\n", hr);
return hr;
}
diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c
index 7a92a7e..8ee226e 100644
--- a/dlls/quartz/filtermapper.c
+++ b/dlls/quartz/filtermapper.c
@@ -248,7 +248,7 @@
LONG lRet;
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);
@@ -515,7 +515,7 @@
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));
hr = E_FAIL;
}
@@ -523,7 +523,7 @@
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);
prf2->dwVersion = prrf->dwVersion;
@@ -544,7 +544,7 @@
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);
rgPins2[i].dwFlags = prrfp->dwFlags;
@@ -787,7 +787,7 @@
CoTaskMemFree(pregfp2);
- TRACE("-- returning %lx\n", hr);
+ TRACE("-- returning %x\n", hr);
return hr;
}
@@ -866,7 +866,7 @@
HRESULT hr;
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,
dwFlags,
bExactMatch ? "true" : "false",
@@ -884,7 +884,7 @@
if (dwFlags != 0)
{
- FIXME("dwFlags = %lx not implemented\n", dwFlags);
+ FIXME("dwFlags = %x not implemented\n", dwFlags);
}
*ppEnum = NULL;
@@ -1095,7 +1095,7 @@
REGFILTER* regfilters;
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,
ppEnum,
dwMerit,
@@ -1220,7 +1220,7 @@
LONG lRet;
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);
diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c
index cceea02..c5111bc 100644
--- a/dlls/quartz/main.c
+++ b/dlls/quartz/main.c
@@ -256,13 +256,13 @@
LONG WINAPI AmpFactorToDB(LONG ampfactor)
{
- FIXME("(%ld) Stub!\n", ampfactor);
+ FIXME("(%d) Stub!\n", ampfactor);
return 0;
}
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 */
if (db < -1000)
return 0;
@@ -272,10 +272,10 @@
DWORD WINAPI AMGetErrorTextA(HRESULT hr, char *buffer, DWORD maxlen)
{
int len;
- static const char format[] = "Error: 0x%lx";
+ static const char format[] = "Error: 0x%x";
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;
wsprintfA(error, format, hr);
@@ -290,7 +290,7 @@
static const WCHAR format[] = {'E','r','r','o','r',':',' ','0','x','%','l','x',0};
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;
wsprintfW(error, format, hr);
diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c
index 08cc20e..917a542 100644
--- a/dlls/quartz/memallocator.c
+++ b/dlls/quartz/memallocator.c
@@ -39,16 +39,16 @@
TRACE("AM_SAMPLE2_PROPERTIES: (null)\n");
return;
}
- TRACE("\tcbData: %ld\n", pProps->cbData);
- TRACE("\tdwTypeSpecificFlags: 0x%8lx\n", pProps->dwTypeSpecificFlags);
- TRACE("\tdwSampleFlags: 0x%8lx\n", pProps->dwSampleFlags);
- TRACE("\tlActual: %ld\n", pProps->lActual);
- TRACE("\ttStart: %lx%08lx%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("\tdwStreamId: 0x%lx\n", pProps->dwStreamId);
+ TRACE("\tcbData: %d\n", pProps->cbData);
+ TRACE("\tdwTypeSpecificFlags: 0x%8x\n", pProps->dwTypeSpecificFlags);
+ TRACE("\tdwSampleFlags: 0x%8x\n", pProps->dwSampleFlags);
+ TRACE("\tlActual: %d\n", pProps->lActual);
+ TRACE("\ttStart: %x%08x%s\n", (LONG)(pProps->tStart >> 32), (LONG)pProps->tStart, pProps->dwSampleFlags & AM_SAMPLE_TIMEVALID ? "" : " (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%x\n", pProps->dwStreamId);
TRACE("\tpMediaType: %p\n", pProps->pMediaType);
TRACE("\tpbBuffer: %p\n", pProps->pbBuffer);
- TRACE("\tcbBuffer: %ld\n", pProps->cbBuffer);
+ TRACE("\tcbBuffer: %d\n", pProps->cbBuffer);
}
typedef struct BaseMemAllocator
@@ -137,7 +137,7 @@
BaseMemAllocator *This = (BaseMemAllocator *)iface;
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;
}
@@ -147,7 +147,7 @@
BaseMemAllocator *This = (BaseMemAllocator *)iface;
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)
{
@@ -245,7 +245,7 @@
{
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());
}
else
@@ -254,7 +254,7 @@
if (SUCCEEDED(hr))
This->bCommitted = TRUE;
else
- ERR("fnAlloc failed with error 0x%lx\n", hr);
+ ERR("fnAlloc failed with error 0x%x\n", hr);
}
}
}
@@ -294,7 +294,7 @@
hr = This->fnFree(iface);
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 @@
/* NOTE: The pStartTime and pEndTime parameters are not applied to the sample.
* The allocator might use these values to determine which buffer it retrieves */
- TRACE("(%p)->(%p, %p, %p, %lx)\n", This, pSample, pStartTime, pEndTime, dwFlags);
+ TRACE("(%p)->(%p, %p, %p, %x)\n", This, pSample, pStartTime, pEndTime, dwFlags);
*pSample = NULL;
@@ -385,7 +385,7 @@
This->hSemWaiting = NULL;
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);
@@ -393,7 +393,7 @@
/* notify a waiting thread that there is now a free buffer */
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());
}
@@ -473,7 +473,7 @@
StdMediaSample2 *This = (StdMediaSample2 *)iface;
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;
}
@@ -483,7 +483,7 @@
StdMediaSample2 *This = (StdMediaSample2 *)iface;
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)
{
@@ -618,7 +618,7 @@
{
StdMediaSample2 *This = (StdMediaSample2 *)iface;
- TRACE("(%ld)\n", len);
+ TRACE("(%d)\n", len);
if ((len > This->props.cbBuffer) || (len < 0))
return VFW_E_BUFFER_OVERFLOW;
@@ -720,7 +720,7 @@
{
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)));
@@ -731,7 +731,7 @@
{
StdMediaSample2 *This = (StdMediaSample2 *)iface;
- TRACE("(%ld, %p)\n", cbProperties, pbProperties);
+ TRACE("(%d, %p)\n", cbProperties, pbProperties);
/* NOTE: pbBuffer and cbBuffer are read-only */
memcpy(&This->props, pbProperties, min(cbProperties, AM_SAMPLE2_PROP_SIZE_WRITABLE));
@@ -821,7 +821,7 @@
/* free memory */
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());
}
diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c
index b59031a..3a280b2 100644
--- a/dlls/quartz/parser.c
+++ b/dlls/quartz/parser.c
@@ -169,7 +169,7 @@
ParserImpl *This = (ParserImpl *)iface;
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;
}
@@ -179,7 +179,7 @@
ParserImpl *This = (ParserImpl *)iface;
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)
{
@@ -342,7 +342,7 @@
{
ParserImpl *This = (ParserImpl *)iface;
- TRACE("(%ld, %p)\n", dwMilliSecsTimeout, pState);
+ TRACE("(%d, %p)\n", dwMilliSecsTimeout, pState);
EnterCriticalSection(&This->csFilter);
{
@@ -503,7 +503,7 @@
{
HeapFree(GetProcessHeap(), 0, This->ppPins);
This->ppPins = ppOldPins;
- ERR("Failed with error %lx\n", hr);
+ ERR("Failed with error %x\n", hr);
}
return hr;
@@ -627,7 +627,7 @@
Parser_OutputPin *This = (Parser_OutputPin *)iface;
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)
{
diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c
index 057ca3e..70ebd5e 100644
--- a/dlls/quartz/pin.c
+++ b/dlls/quartz/pin.c
@@ -113,7 +113,7 @@
FreeMediaType(&This->pin.mtCurrent);
}
- TRACE(" -- %lx\n", hr);
+ TRACE(" -- %x\n", hr);
return hr;
}
@@ -232,7 +232,7 @@
IPinImpl *This = (IPinImpl *)iface;
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;
}
@@ -411,7 +411,7 @@
InputPin *This = (InputPin *)iface;
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)
{
@@ -497,7 +497,7 @@
{
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->tStop = tStop;
@@ -670,7 +670,7 @@
OutputPin *This = (OutputPin *)iface;
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)
{
@@ -748,7 +748,7 @@
} /* if succeeded */
LeaveCriticalSection(This->pin.pCritSec);
- TRACE(" -- %lx\n", hr);
+ TRACE(" -- %x\n", hr);
return hr;
}
@@ -816,7 +816,7 @@
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 */
@@ -849,7 +849,7 @@
{
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);
{
@@ -1173,7 +1173,7 @@
* it is harder to debug so for the moment it will stay as it is */
IMediaSample * pSample = NULL;
REFERENCE_TIME rtSampleStop;
- DWORD dwUser;
+ DWORD_PTR dwUser;
TRACE("Process sample\n");
@@ -1197,7 +1197,7 @@
if (SUCCEEDED(hr))
hr = This->fnSampleProc(This->pin.pUserData, pSample);
else
- ERR("Processing error: %lx\n", hr);
+ ERR("Processing error: %x\n", hr);
if (pSample)
IMediaSample_Release(pSample);
@@ -1221,7 +1221,7 @@
CloseHandle(This->hThread);
This->hThread = NULL;
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);
@@ -1256,7 +1256,7 @@
LeaveCriticalSection(This->pin.pCritSec);
}
- TRACE(" -- %lx\n", hr);
+ TRACE(" -- %x\n", hr);
return hr;
}
@@ -1313,7 +1313,7 @@
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);
/* FIXME: need critical section? */
diff --git a/dlls/quartz/regsvr.c b/dlls/quartz/regsvr.c
index a6bd671..fba6024 100644
--- a/dlls/quartz/regsvr.c
+++ b/dlls/quartz/regsvr.c
@@ -629,7 +629,7 @@
}
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);
break;
}
diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c
index 6e2502e..3d3627d 100644
--- a/dlls/quartz/systemclock.c
+++ b/dlls/quartz/systemclock.c
@@ -196,7 +196,7 @@
SystemClockImpl *This = (SystemClockImpl *)iface;
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;
}
@@ -219,7 +219,7 @@
static ULONG WINAPI SystemClockImpl_Release(IReferenceClock* iface) {
SystemClockImpl *This = (SystemClockImpl *)iface;
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 (SystemClockPostMessageToAdviseThread(This, ADVISE_EXIT)) {
WaitForSingleObject(This->adviseThread, INFINITE);
diff --git a/dlls/quartz/transform.c b/dlls/quartz/transform.c
index f4f68d2..63b6ad5 100644
--- a/dlls/quartz/transform.c
+++ b/dlls/quartz/transform.c
@@ -67,13 +67,13 @@
hr = IMediaSample_GetPointer(pSample, &pbSrcStream);
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;
}
hr = IMediaSample_GetTime(pSample, &tStart, &tStop);
if (FAILED(hr))
- ERR("Cannot get sample time (%lx)\n", hr);
+ ERR("Cannot get sample time (%x)\n", hr);
cbSrcStream = IMediaSample_GetActualDataLength(pSample);
@@ -214,7 +214,7 @@
hr = TransformFilter_OutputPin_Construct(&piOutput, &props, pTransformFilter, TransformFilter_Output_QueryAccept, &pTransformFilter->csFilter, &pTransformFilter->ppPins[1]);
if (FAILED(hr))
- ERR("Cannot create output pin (%lx)\n", hr);
+ ERR("Cannot create output pin (%x)\n", hr);
}
else
{
@@ -258,7 +258,7 @@
TransformFilterImpl *This = (TransformFilterImpl *)iface;
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;
}
@@ -268,7 +268,7 @@
TransformFilterImpl *This = (TransformFilterImpl *)iface;
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)
{
@@ -367,7 +367,7 @@
{
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);
{
@@ -519,7 +519,7 @@
}
if (FAILED(hr))
- ERR("%lx\n", hr);
+ ERR("%x\n", hr);
return hr;
}
diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c
index eaaada6..b4c2a0b 100644
--- a/dlls/quartz/videorenderer.c
+++ b/dlls/quartz/videorenderer.c
@@ -125,7 +125,7 @@
switch(uMsg)
{
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);
GetClientRect(hwnd, &pVideoRenderer->DestRect);
return TRUE;
@@ -156,7 +156,7 @@
{
if (!RegisterClassA(&winclass))
{
- ERR("Unable to register window %lx\n", GetLastError());
+ ERR("Unable to register window %x\n", GetLastError());
return FALSE;
}
wnd_class_registered = TRUE;
@@ -283,7 +283,7 @@
LPBYTE palette = NULL;
HDC hDC;
- TRACE("%p %p %ld\n", This, data, size);
+ TRACE("%p %p %d\n", This, data, size);
sdesc.dwSize = sizeof(sdesc);
hr = IPin_ConnectionMediaType(This->ppPins[0], &amt);
@@ -293,13 +293,13 @@
}
format = (VIDEOINFOHEADER*)amt.pbFormat;
- TRACE("biSize = %ld\n", format->bmiHeader.biSize);
- TRACE("biWidth = %ld\n", format->bmiHeader.biWidth);
- TRACE("biHeigth = %ld\n", format->bmiHeader.biHeight);
+ TRACE("biSize = %d\n", format->bmiHeader.biSize);
+ TRACE("biWidth = %d\n", format->bmiHeader.biWidth);
+ TRACE("biHeigth = %d\n", format->bmiHeader.biHeight);
TRACE("biPlanes = %d\n", format->bmiHeader.biPlanes);
TRACE("biBitCount = %d\n", format->bmiHeader.biBitCount);
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;
height = format->bmiHeader.biHeight;
@@ -330,8 +330,8 @@
return E_FAIL;
}
- TRACE("Src Rect: %ld %ld %ld %ld\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("Src Rect: %d %d %d %d\n", This->SourceRect.left, This->SourceRect.top, This->SourceRect.right, This->SourceRect.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,
This->DestRect.bottom - This->DestRect.top, This->SourceRect.left, This->SourceRect.top,
@@ -359,13 +359,13 @@
hr = IMediaSample_GetPointer(pSample, &pbSrcStream);
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;
}
hr = IMediaSample_GetTime(pSample, &tStart, &tStop);
if (FAILED(hr))
- ERR("Cannot get sample time (%lx)\n", hr);
+ ERR("Cannot get sample time (%x)\n", hr);
cbSrcStream = IMediaSample_GetActualDataLength(pSample);
@@ -506,7 +506,7 @@
VideoRendererImpl *This = (VideoRendererImpl *)iface;
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;
}
@@ -516,7 +516,7 @@
VideoRendererImpl *This = (VideoRendererImpl *)iface;
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)
{
@@ -609,7 +609,7 @@
{
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);
{
@@ -825,7 +825,7 @@
ITypeInfo**ppTInfo) {
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;
}
@@ -838,7 +838,7 @@
DISPID*rgDispId) {
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;
}
@@ -854,7 +854,7 @@
UINT*puArgErr) {
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;
}
@@ -1322,7 +1322,7 @@
ITypeInfo**ppTInfo) {
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;
}
@@ -1335,7 +1335,7 @@
DISPID*rgDispId) {
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;
}
@@ -1351,7 +1351,7 @@
UINT*puArgErr) {
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;
}
@@ -1387,7 +1387,7 @@
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))
return E_INVALIDARG;
@@ -1618,7 +1618,7 @@
OAHWND Owner) {
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);
@@ -1629,7 +1629,7 @@
OAHWND *Owner) {
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);
@@ -1640,7 +1640,7 @@
OAHWND Drain) {
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;
@@ -1728,7 +1728,7 @@
LONG_PTR lParam) {
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))
return E_FAIL;
diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c
index 5b41784..54ea9ad 100644
--- a/dlls/quartz/waveparser.c
+++ b/dlls/quartz/waveparser.c
@@ -95,7 +95,7 @@
}
else
{
- TRACE("Skipping sending sample due to error (%lx)\n", hr);
+ TRACE("Skipping sending sample due to error (%x)\n", hr);
This->pCurrentSample = NULL;
break;
}
@@ -147,7 +147,7 @@
hr = OutputPin_SendSample(&pOutputPin->pin, This->pCurrentSample);
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)
@@ -188,7 +188,7 @@
}
if (FAILED(hr))
{
- ERR("%lx\n", hr);
+ ERR("%x\n", hr);
break;
}
}
