system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-02 14:44:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

qcap: Win64 printf format warning fixes.

Browse source
This commit is contained in:
Michael Stefaniuc 2006-10-08 19:36:31 +02:00 committed by Alexandre Julliard
parent 611220d554
commit 079bb8a51d
7 changed files with 26 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dlls/qcap/Makefile.in
View file

@ -5,7 +5,6 @@ VPATH = @srcdir@
MODULE = qcap.dll
IMPORTS = ole32 oleaut32 user32 gdi32 advapi32 kernel32
EXTRALIBS = -lstrmiids -luuid
EXTRADEFS = -DWINE_NO_LONG_AS_INT
C_SRCS = \
capturegraph.c \

4
dlls/qcap/capturegraph.c
View file

@ -145,7 +145,7 @@ fnCaptureGraphBuilder2_AddRef(ICaptureGraphBuilder2 * iface)
CaptureGraphImpl *This = impl_from_ICaptureGraphBuilder2(iface);
DWORD ref = InterlockedIncrement(&This->ref);
TRACE("(%p/%p)->() AddRef from %ld\n", This, iface, ref - 1);
TRACE("(%p/%p)->() AddRef from %d\n", This, iface, ref - 1);
return ref;
}
@ -155,7 +155,7 @@ fnCaptureGraphBuilder2_Release(ICaptureGraphBuilder2 * iface)
CaptureGraphImpl *This = impl_from_ICaptureGraphBuilder2(iface);
DWORD ref = InterlockedDecrement(&This->ref);
TRACE("(%p/%p)->() Release from %ld\n", This, iface, ref + 1);
TRACE("(%p/%p)->() Release from %d\n", This, iface, ref + 1);
if (!ref)
{

6
dlls/qcap/enummedia.c
View file

@ -189,8 +189,8 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Next(IEnumMediaTypes * iface,
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)
{
@ -221,7 +221,7 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Skip(IEnumMediaTypes * iface,
{
IEnumMediaTypesImpl *This = (IEnumMediaTypesImpl *)iface;
TRACE("(%lu)\n", cMediaTypes);
TRACE("(%u)\n", cMediaTypes);
if (This->uIndex + cMediaTypes < This->enumMediaDetails.cMediaTypes)
{

4
dlls/qcap/enumpins.c
View file

@ -116,7 +116,7 @@ static HRESULT WINAPI IEnumPinsImpl_Next(IEnumPins * iface, ULONG cPins, IPin **
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)
{
@ -141,7 +141,7 @@ static HRESULT WINAPI IEnumPinsImpl_Skip(IEnumPins * iface, ULONG cPins)
{
IEnumPinsImpl *This = (IEnumPinsImpl *)iface;
TRACE("(%lu)\n", cPins);
TRACE("(%u)\n", cPins);
if (This->uIndex + cPins < This->enumPinDetails.cPins)
{

6
dlls/qcap/pin.c
View file

@ -219,7 +219,7 @@ static HRESULT OutputPin_ConnectSpecific(IPin * iface, IPin * pReceivePin, const
DeleteMediaType(&This->pin.mtCurrent);
}
TRACE(" -- %lx\n", hr);
TRACE(" -- %x\n", hr);
return hr;
}
@ -318,7 +318,7 @@ HRESULT WINAPI OutputPin_Connect(IPin * iface, IPin * pReceivePin, const AM_MEDI
} /* if succeeded */
LeaveCriticalSection(This->pin.pCritSec);
TRACE(" -- %lx\n", hr);
TRACE(" -- %x\n", hr);
return hr;
}
@ -361,7 +361,7 @@ HRESULT OutputPin_GetDeliveryBuffer(OutputPin * This, IMediaSample ** ppSample,
{
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);
{

14
dlls/qcap/v4l.c
View file

@ -241,7 +241,7 @@ HRESULT qcap_driver_set_format(Capture *capBox, AM_MEDIA_TYPE * mT)
if (format->bmiHeader.biBitCount != 24 ||
format->bmiHeader.biCompression != BI_RGB)
{
FIXME("unsupported media type %d %ld\n", format->bmiHeader.biBitCount,
FIXME("unsupported media type %d %d\n", format->bmiHeader.biBitCount,
format->bmiHeader.biCompression );
return VFW_E_INVALIDMEDIATYPE;
}
@ -299,7 +299,7 @@ HRESULT qcap_driver_get_format(Capture *capBox, AM_MEDIA_TYPE ** mT)
mT[0]->bTemporalCompression = FALSE;
mT[0]->pUnk = NULL;
mT[0]->lSampleSize = capBox->outputwidth * capBox->outputheight * capBox->bitDepth / 8;
TRACE("Output format: %dx%d - %d bits = %lu KB\n", capBox->outputwidth,
TRACE("Output format: %dx%d - %d bits = %u KB\n", capBox->outputwidth,
capBox->outputheight, capBox->bitDepth, mT[0]->lSampleSize/1024);
vi->rcSource.left = 0; vi->rcSource.top = 0;
vi->rcTarget.left = 0; vi->rcTarget.top = 0;
@ -608,14 +608,14 @@ static DWORD WINAPI ReadThread(LPVOID lParam)
capBox->renderer(capBox, pOutput, pInput);
Resize(capBox, pTarget, pOutput);
hr = OutputPin_SendSample((OutputPin *)capBox->pOut, pSample);
TRACE("%p -> Frame %lu: %lx\n", capBox, ++framecount, hr);
TRACE("%p -> Frame %lu: %x\n", capBox, ++framecount, hr);
IMediaSample_Release(pSample);
V4l_FreeFrame(capBox);
}
LeaveCriticalSection(&capBox->CritSect);
if (FAILED(hr) && hr != VFW_E_NOT_CONNECTED)
{
ERR("Received error: %lx\n", hr);
ERR("Received error: %x\n", hr);
goto cfail;
}
}
@ -678,7 +678,7 @@ HRESULT qcap_driver_run(Capture *capBox, FILTER_STATE *state)
if (pAlloc)
IMemAllocator_Release(pAlloc);
TRACE("Committing allocator: %lx\n", hr);
TRACE("Committing allocator: %x\n", hr);
}
thread = CreateThread(NULL, 0, ReadThread, capBox, 0, NULL);
@ -689,7 +689,7 @@ HRESULT qcap_driver_run(Capture *capBox, FILTER_STATE *state)
LeaveCriticalSection(&capBox->CritSect);
return S_OK;
}
ERR("Creating thread failed.. %lx\n", GetLastError());
ERR("Creating thread failed.. %x\n", GetLastError());
LeaveCriticalSection(&capBox->CritSect);
return E_FAIL;
}
@ -762,7 +762,7 @@ HRESULT qcap_driver_stop(Capture *capBox, FILTER_STATE *state)
IPin_Release(pConnect);
if (hr != S_OK && hr != VFW_E_NOT_COMMITTED)
WARN("Decommitting allocator: %lx\n", hr);
WARN("Decommitting allocator: %x\n", hr);
}
V4l_Unprepare(capBox);
}

18
dlls/qcap/vfwcapture.c
View file

@ -178,7 +178,7 @@ static ULONG WINAPI VfwCapture_AddRef(IBaseFilter * iface)
VfwCapture *This = (VfwCapture *)iface;
ULONG refCount = InterlockedIncrement(&This->refCount);
TRACE("%p->() New refcount: %ld\n", This, refCount);
TRACE("%p->() New refcount: %d\n", This, refCount);
return refCount;
}
@ -188,7 +188,7 @@ static ULONG WINAPI VfwCapture_Release(IBaseFilter * iface)
VfwCapture *This = (VfwCapture *)iface;
ULONG refCount = InterlockedDecrement(&This->refCount);
TRACE("%p->() New refcount: %ld\n", This, refCount);
TRACE("%p->() New refcount: %d\n", This, refCount);
if (!refCount)
{
@ -246,7 +246,7 @@ static HRESULT WINAPI VfwCapture_Pause(IBaseFilter * iface)
static HRESULT WINAPI VfwCapture_Run(IBaseFilter * iface, REFERENCE_TIME tStart)
{
VfwCapture *This = (VfwCapture *)iface;
TRACE("(%lx%08lx)\n", (ULONG)(tStart >> 32), (ULONG)tStart);
TRACE("(%x%08x)\n", (ULONG)(tStart >> 32), (ULONG)tStart);
return qcap_driver_run(This->driver_info, &This->state);
}
@ -256,7 +256,7 @@ VfwCapture_GetState( IBaseFilter * iface, DWORD dwMilliSecsTimeout,
{
VfwCapture *This = (VfwCapture *)iface;
TRACE("(%lu, %p)\n", dwMilliSecsTimeout, pState);
TRACE("(%u, %p)\n", dwMilliSecsTimeout, pState);
*pState = This->state;
return S_OK;
@ -412,7 +412,7 @@ AMStreamConfig_SetFormat(IAMStreamConfig *iface, AM_MEDIA_TYPE *pmt)
if (pin->pConnectedTo != NULL)
{
hr = IPin_QueryAccept(pin->pConnectedTo, pmt);
TRACE("Would accept: %ld\n", hr);
TRACE("Would accept: %d\n", hr);
if (hr == S_FALSE)
return VFW_E_INVALIDMEDIATYPE;
}
@ -424,7 +424,7 @@ AMStreamConfig_SetFormat(IAMStreamConfig *iface, AM_MEDIA_TYPE *pmt)
if (SUCCEEDED(hr))
TRACE("Reconnection completed, with new media format..\n");
}
TRACE("Returning: %ld\n", hr);
TRACE("Returning: %d\n", hr);
return hr;
}
@ -796,7 +796,7 @@ static ULONG WINAPI VfwPin_AddRef(IPin * iface)
VfwPinImpl *This = (VfwPinImpl *)iface;
ULONG refCount = InterlockedIncrement(&This->pin.pin.refCount);
TRACE("() -> new refcount: %lu\n", refCount);
TRACE("() -> new refcount: %u\n", refCount);
return refCount;
}
@ -807,7 +807,7 @@ VfwPin_Release(IPin * iface)
VfwPinImpl *This = (VfwPinImpl *)iface;
ULONG refCount = InterlockedDecrement(&This->pin.pin.refCount);
TRACE("() -> new refcount: %lu\n", refCount);
TRACE("() -> new refcount: %u\n", refCount);
if (!refCount)
{
@ -830,7 +830,7 @@ VfwPin_EnumMediaTypes(IPin * iface, IEnumMediaTypes ** ppEnum)
emd.pMediaTypes = pmt;
if (SUCCEEDED(hr))
hr = IEnumMediaTypesImpl_Construct(&emd, ppEnum);
TRACE("%p -- %lx\n", This, hr);
TRACE("%p -- %x\n", This, hr);
DeleteMediaType(pmt);
return hr;
}