From b14c0056dd2859f2f7a7bd3f6099d86e00c80d1a Mon Sep 17 00:00:00 2001 From: Michael Stefaniuc Date: Thu, 12 Mar 2009 01:42:24 +0100 Subject: [PATCH] qedit: Change long to LONG in qedit.idl. --- dlls/qedit/mediadet.c | 22 +++++++++++----------- dlls/qedit/tests/mediadet.c | 4 ++-- include/qedit.idl | 24 ++++++++++++------------ 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index 2cf37f96a8..d27a638f36 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -112,7 +112,7 @@ static HRESULT WINAPI MediaDet_put_Filter(IMediaDet* iface, IUnknown *newVal) return E_NOTIMPL; } -static HRESULT WINAPI MediaDet_get_OutputStreams(IMediaDet* iface, long *pVal) +static HRESULT WINAPI MediaDet_get_OutputStreams(IMediaDet* iface, LONG *pVal) { MediaDetImpl *This = (MediaDetImpl *)iface; IEnumPins *pins; @@ -156,7 +156,7 @@ static HRESULT WINAPI MediaDet_get_OutputStreams(IMediaDet* iface, long *pVal) return S_OK; } -static HRESULT WINAPI MediaDet_get_CurrentStream(IMediaDet* iface, long *pVal) +static HRESULT WINAPI MediaDet_get_CurrentStream(IMediaDet* iface, LONG *pVal) { MediaDetImpl *This = (MediaDetImpl *)iface; TRACE("(%p)\n", This); @@ -209,16 +209,16 @@ static HRESULT SetCurPin(MediaDetImpl *This, long strm) return S_OK; } -static HRESULT WINAPI MediaDet_put_CurrentStream(IMediaDet* iface, long newVal) +static HRESULT WINAPI MediaDet_put_CurrentStream(IMediaDet* iface, LONG newVal) { MediaDetImpl *This = (MediaDetImpl *)iface; HRESULT hr; - TRACE("(%p)->(%ld)\n", This, newVal); + TRACE("(%p)->(%d)\n", This, newVal); if (This->num_streams == -1) { - long n; + LONG n; hr = MediaDet_get_OutputStreams(iface, &n); if (FAILED(hr)) return hr; @@ -461,21 +461,21 @@ static HRESULT WINAPI MediaDet_put_Filename(IMediaDet* iface, BSTR newVal) static HRESULT WINAPI MediaDet_GetBitmapBits(IMediaDet* iface, double StreamTime, - long *pBufferSize, char *pBuffer, - long Width, long Height) + LONG *pBufferSize, char *pBuffer, + LONG Width, LONG Height) { MediaDetImpl *This = (MediaDetImpl *)iface; - FIXME("(%p)->(%f %p %p %ld %ld): not implemented!\n", This, StreamTime, pBufferSize, pBuffer, + FIXME("(%p)->(%f %p %p %d %d): not implemented!\n", This, StreamTime, pBufferSize, pBuffer, Width, Height); return E_NOTIMPL; } static HRESULT WINAPI MediaDet_WriteBitmapBits(IMediaDet* iface, - double StreamTime, long Width, - long Height, BSTR Filename) + double StreamTime, LONG Width, + LONG Height, BSTR Filename) { MediaDetImpl *This = (MediaDetImpl *)iface; - FIXME("(%p)->(%f %ld %ld %p): not implemented!\n", This, StreamTime, Width, Height, Filename); + FIXME("(%p)->(%f %d %d %p): not implemented!\n", This, StreamTime, Width, Height, Filename); return E_NOTIMPL; } diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index 711281d8cc..d1f53a070c 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -94,8 +94,8 @@ static void test_mediadet(void) HRESULT hr; IMediaDet *pM = NULL; BSTR filename = NULL; - long nstrms = 0; - long strm; + LONG nstrms = 0; + LONG strm; AM_MEDIA_TYPE mt; double fps; int flags; diff --git a/include/qedit.idl b/include/qedit.idl index 48764c11a7..ea1e593ad6 100644 --- a/include/qedit.idl +++ b/include/qedit.idl @@ -37,7 +37,7 @@ interface ISampleGrabberCB : IUnknown HRESULT BufferCB( double SampleTime, BYTE * pBuffer, - long BufferLen + LONG BufferLen ); } @@ -66,8 +66,8 @@ interface ISampleGrabber: IUnknown ); HRESULT GetCurrentBuffer( - [in,out] long * pBufferSize, - [out] long * pBuffer + [in,out] LONG * pBufferSize, + [out] LONG * pBuffer ); HRESULT GetCurrentSample( @@ -76,7 +76,7 @@ interface ISampleGrabber: IUnknown HRESULT SetCallback( ISampleGrabberCB * pCallback, - long WhichMethodToCallback + LONG WhichMethodToCallback ); }; @@ -96,15 +96,15 @@ interface IMediaDet : IUnknown ); HRESULT get_OutputStreams( - [out] long *pVal + [out] LONG *pVal ); HRESULT get_CurrentStream( - [out] long *pVal + [out] LONG *pVal ); HRESULT put_CurrentStream( - long newVal + LONG newVal ); HRESULT get_StreamType( @@ -129,16 +129,16 @@ interface IMediaDet : IUnknown HRESULT GetBitmapBits( double StreamTime, - long * pBufferSize, + LONG * pBufferSize, char * pBuffer, - long Width, - long Height + LONG Width, + LONG Height ); HRESULT WriteBitmapBits( double StreamTime, - long Width, - long Height, + LONG Width, + LONG Height, BSTR Filename );