From a3269bdc40c7267f3dc882fd95184c5cdeee8ec2 Mon Sep 17 00:00:00 2001 From: Michael Stefaniuc Date: Wed, 11 Mar 2009 00:31:26 +0100 Subject: [PATCH] quartz: Change long to LONG in control.idl. --- dlls/quartz/dsoundrender.c | 12 +- dlls/quartz/filtergraph.c | 278 ++++++++++++++++++++++---------------------- dlls/quartz/videorenderer.c | 236 ++++++++++++++++++------------------- include/control.idl | 154 ++++++++++++------------ 4 files changed, 340 insertions(+), 340 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 00c2af87481..edb170da136 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -1107,10 +1107,10 @@ static HRESULT WINAPI Basicaudio_Invoke(IBasicAudio *iface, /*** IBasicAudio methods ***/ static HRESULT WINAPI Basicaudio_put_Volume(IBasicAudio *iface, - long lVolume) { + LONG lVolume) { ICOM_THIS_MULTI(DSoundRenderImpl, IBasicAudio_vtbl, iface); - TRACE("(%p/%p)->(%ld)\n", This, iface, lVolume); + TRACE("(%p/%p)->(%d)\n", This, iface, lVolume); if (lVolume > DSBVOLUME_MAX || lVolume < DSBVOLUME_MIN) return E_INVALIDARG; @@ -1125,7 +1125,7 @@ static HRESULT WINAPI Basicaudio_put_Volume(IBasicAudio *iface, } static HRESULT WINAPI Basicaudio_get_Volume(IBasicAudio *iface, - long *plVolume) { + LONG *plVolume) { ICOM_THIS_MULTI(DSoundRenderImpl, IBasicAudio_vtbl, iface); TRACE("(%p/%p)->(%p)\n", This, iface, plVolume); @@ -1138,10 +1138,10 @@ static HRESULT WINAPI Basicaudio_get_Volume(IBasicAudio *iface, } static HRESULT WINAPI Basicaudio_put_Balance(IBasicAudio *iface, - long lBalance) { + LONG lBalance) { ICOM_THIS_MULTI(DSoundRenderImpl, IBasicAudio_vtbl, iface); - TRACE("(%p/%p)->(%ld)\n", This, iface, lBalance); + TRACE("(%p/%p)->(%d)\n", This, iface, lBalance); if (lBalance < DSBPAN_LEFT || lBalance > DSBPAN_RIGHT) return E_INVALIDARG; @@ -1156,7 +1156,7 @@ static HRESULT WINAPI Basicaudio_put_Balance(IBasicAudio *iface, } static HRESULT WINAPI Basicaudio_get_Balance(IBasicAudio *iface, - long *plBalance) { + LONG *plBalance) { ICOM_THIS_MULTI(DSoundRenderImpl, IBasicAudio_vtbl, iface); TRACE("(%p/%p)->(%p)\n", This, iface, plBalance); diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index d58dc0076e0..ab0d47e2fd7 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2852,12 +2852,12 @@ static HRESULT WINAPI BasicAudio_Invoke(IBasicAudio *iface, /*** IBasicAudio methods ***/ static HRESULT WINAPI BasicAudio_put_Volume(IBasicAudio *iface, - long lVolume) { + LONG lVolume) { ICOM_THIS_MULTI(IFilterGraphImpl, IBasicAudio_vtbl, iface); IBasicAudio* pBasicAudio; HRESULT hr; - TRACE("(%p/%p)->(%ld)\n", This, iface, lVolume); + TRACE("(%p/%p)->(%d)\n", This, iface, lVolume); EnterCriticalSection(&This->cs); @@ -2872,7 +2872,7 @@ static HRESULT WINAPI BasicAudio_put_Volume(IBasicAudio *iface, } static HRESULT WINAPI BasicAudio_get_Volume(IBasicAudio *iface, - long *plVolume) { + LONG *plVolume) { ICOM_THIS_MULTI(IFilterGraphImpl, IBasicAudio_vtbl, iface); IBasicAudio* pBasicAudio; HRESULT hr; @@ -2892,12 +2892,12 @@ static HRESULT WINAPI BasicAudio_get_Volume(IBasicAudio *iface, } static HRESULT WINAPI BasicAudio_put_Balance(IBasicAudio *iface, - long lBalance) { + LONG lBalance) { ICOM_THIS_MULTI(IFilterGraphImpl, IBasicAudio_vtbl, iface); IBasicAudio* pBasicAudio; HRESULT hr; - TRACE("(%p/%p)->(%ld)\n", This, iface, lBalance); + TRACE("(%p/%p)->(%d)\n", This, iface, lBalance); EnterCriticalSection(&This->cs); @@ -2912,7 +2912,7 @@ static HRESULT WINAPI BasicAudio_put_Balance(IBasicAudio *iface, } static HRESULT WINAPI BasicAudio_get_Balance(IBasicAudio *iface, - long *plBalance) { + LONG *plBalance) { ICOM_THIS_MULTI(IFilterGraphImpl, IBasicAudio_vtbl, iface); IBasicAudio* pBasicAudio; HRESULT hr; @@ -3089,7 +3089,7 @@ static HRESULT WINAPI BasicVideo_get_AvgTimePerFrame(IBasicVideo2 *iface, } static HRESULT WINAPI BasicVideo_get_BitRate(IBasicVideo2 *iface, - long *pBitRate) { + LONG *pBitRate) { ICOM_THIS_MULTI(IFilterGraphImpl, IBasicVideo_vtbl, iface); IBasicVideo* pBasicVideo; HRESULT hr; @@ -3109,7 +3109,7 @@ static HRESULT WINAPI BasicVideo_get_BitRate(IBasicVideo2 *iface, } static HRESULT WINAPI BasicVideo_get_BitErrorRate(IBasicVideo2 *iface, - long *pBitErrorRate) { + LONG *pBitErrorRate) { ICOM_THIS_MULTI(IFilterGraphImpl, IBasicVideo_vtbl, iface); IBasicVideo* pBasicVideo; HRESULT hr; @@ -3129,7 +3129,7 @@ static HRESULT WINAPI BasicVideo_get_BitErrorRate(IBasicVideo2 *iface, } static HRESULT WINAPI BasicVideo_get_VideoWidth(IBasicVideo2 *iface, - long *pVideoWidth) { + LONG *pVideoWidth) { ICOM_THIS_MULTI(IFilterGraphImpl, IBasicVideo_vtbl, iface); IBasicVideo* pBasicVideo; HRESULT hr; @@ -3149,7 +3149,7 @@ static HRESULT WINAPI BasicVideo_get_VideoWidth(IBasicVideo2 *iface, } static HRESULT WINAPI BasicVideo_get_VideoHeight(IBasicVideo2 *iface, - long *pVideoHeight) { + LONG *pVideoHeight) { ICOM_THIS_MULTI(IFilterGraphImpl, IBasicVideo_vtbl, iface); IBasicVideo* pBasicVideo; HRESULT hr; @@ -3169,12 +3169,12 @@ static HRESULT WINAPI BasicVideo_get_VideoHeight(IBasicVideo2 *iface, } static HRESULT WINAPI BasicVideo_put_SourceLeft(IBasicVideo2 *iface, - long SourceLeft) { + LONG SourceLeft) { ICOM_THIS_MULTI(IFilterGraphImpl, IBasicVideo_vtbl, iface); IBasicVideo* pBasicVideo; HRESULT hr; - TRACE("(%p/%p)->(%ld)\n", This, iface, SourceLeft); + TRACE("(%p/%p)->(%d)\n", This, iface, SourceLeft); EnterCriticalSection(&This->cs); @@ -3189,7 +3189,7 @@ static HRESULT WINAPI BasicVideo_put_SourceLeft(IBasicVideo2 *iface, } static HRESULT WINAPI BasicVideo_get_SourceLeft(IBasicVideo2 *iface, - long *pSourceLeft) { + LONG *pSourceLeft) { ICOM_THIS_MULTI(IFilterGraphImpl, IBasicVideo_vtbl, iface); IBasicVideo* pBasicVideo; HRESULT hr; @@ -3209,12 +3209,12 @@ static HRESULT WINAPI BasicVideo_get_SourceLeft(IBasicVideo2 *iface, } static HRESULT WINAPI BasicVideo_put_SourceWidth(IBasicVideo2 *iface, - long SourceWidth) { + LONG SourceWidth) { ICOM_THIS_MULTI(IFilterGraphImpl, IBasicVideo_vtbl, iface); IBasicVideo* pBasicVideo; HRESULT hr; - TRACE("(%p/%p)->(%ld)\n", This, iface, SourceWidth); + TRACE("(%p/%p)->(%d)\n", This, iface, SourceWidth); EnterCriticalSection(&This->cs); @@ -3229,7 +3229,7 @@ static HRESULT WINAPI BasicVideo_put_SourceWidth(IBasicVideo2 *iface, } static HRESULT WINAPI BasicVideo_get_SourceWidth(IBasicVideo2 *iface, - long *pSourceWidth) { + LONG *pSourceWidth) { ICOM_THIS_MULTI(IFilterGraphImpl, IBasicVideo_vtbl, iface); IBasicVideo* pBasicVideo; HRESULT hr; @@ -3249,12 +3249,12 @@ static HRESULT WINAPI BasicVideo_get_SourceWidth(IBasicVideo2 *iface, } static HRESULT WINAPI BasicVideo_put_SourceTop(IBasicVideo2 *iface, - long SourceTop) { + LONG SourceTop) { ICOM_THIS_MULTI(IFilterGraphImpl, IBasicVideo_vtbl, iface); IBasicVideo* pBasicVideo; HRESULT hr; - TRACE("(%p/%p)->(%ld)\n", This, iface, SourceTop); + TRACE("(%p/%p)->(%d)\n", This, iface, SourceTop); EnterCriticalSection(&This->cs); @@ -3269,7 +3269,7 @@ static HRESULT WINAPI BasicVideo_put_SourceTop(IBasicVideo2 *iface, } static HRESULT WINAPI BasicVideo_get_SourceTop(IBasicVideo2 *iface, - long *pSourceTop) { + LONG *pSourceTop) { ICOM_THIS_MULTI(IFilterGraphImpl, IBasicVideo_vtbl, iface); IBasicVideo* pBasicVideo; HRESULT hr; @@ -3289,12 +3289,12 @@ static HRESULT WINAPI BasicVideo_get_SourceTop(IBasicVideo2 *iface, } static HRESULT WINAPI BasicVideo_put_SourceHeight(IBasicVideo2 *iface, - long SourceHeight) { + LONG SourceHeight) { ICOM_THIS_MULTI(IFilterGraphImpl, IBasicVideo_vtbl, iface); IBasicVideo* pBasicVideo; HRESULT hr; - TRACE("(%p/%p)->(%ld)\n", This, iface, SourceHeight); + TRACE("(%p/%p)->(%d)\n", This, iface, SourceHeight); EnterCriticalSection(&This->cs); @@ -3309,7 +3309,7 @@ static HRESULT WINAPI BasicVideo_put_SourceHeight(IBasicVideo2 *iface, } static HRESULT WINAPI BasicVideo_get_SourceHeight(IBasicVideo2 *iface, - long *pSourceHeight) { + LONG *pSourceHeight) { ICOM_THIS_MULTI(IFilterGraphImpl, IBasicVideo_vtbl, iface); IBasicVideo* pBasicVideo; HRESULT hr; @@ -3329,12 +3329,12 @@ static HRESULT WINAPI BasicVideo_get_SourceHeight(IBasicVideo2 *iface, } static HRESULT WINAPI BasicVideo_put_DestinationLeft(IBasicVideo2 *iface, - long DestinationLeft) { + LONG DestinationLeft) { ICOM_THIS_MULTI(IFilterGraphImpl, IBasicVideo_vtbl, iface); IBasicVideo* pBasicVideo; HRESULT hr; - TRACE("(%p/%p)->(%ld)\n", This, iface, DestinationLeft); + TRACE("(%p/%p)->(%d)\n", This, iface, DestinationLeft); EnterCriticalSection(&This->cs); @@ -3349,7 +3349,7 @@ static HRESULT WINAPI BasicVideo_put_DestinationLeft(IBasicVideo2 *iface, } static HRESULT WINAPI BasicVideo_get_DestinationLeft(IBasicVideo2 *iface, - long *pDestinationLeft) { + LONG *pDestinationLeft) { ICOM_THIS_MULTI(IFilterGraphImpl, IBasicVideo_vtbl, iface); IBasicVideo* pBasicVideo; HRESULT hr; @@ -3369,12 +3369,12 @@ static HRESULT WINAPI BasicVideo_get_DestinationLeft(IBasicVideo2 *iface, } static HRESULT WINAPI BasicVideo_put_DestinationWidth(IBasicVideo2 *iface, - long DestinationWidth) { + LONG DestinationWidth) { ICOM_THIS_MULTI(IFilterGraphImpl, IBasicVideo_vtbl, iface); IBasicVideo* pBasicVideo; HRESULT hr; - TRACE("(%p/%p)->(%ld)\n", This, iface, DestinationWidth); + TRACE("(%p/%p)->(%d)\n", This, iface, DestinationWidth); EnterCriticalSection(&This->cs); @@ -3389,7 +3389,7 @@ static HRESULT WINAPI BasicVideo_put_DestinationWidth(IBasicVideo2 *iface, } static HRESULT WINAPI BasicVideo_get_DestinationWidth(IBasicVideo2 *iface, - long *pDestinationWidth) { + LONG *pDestinationWidth) { ICOM_THIS_MULTI(IFilterGraphImpl, IBasicVideo_vtbl, iface); IBasicVideo* pBasicVideo; HRESULT hr; @@ -3409,12 +3409,12 @@ static HRESULT WINAPI BasicVideo_get_DestinationWidth(IBasicVideo2 *iface, } static HRESULT WINAPI BasicVideo_put_DestinationTop(IBasicVideo2 *iface, - long DestinationTop) { + LONG DestinationTop) { ICOM_THIS_MULTI(IFilterGraphImpl, IBasicVideo_vtbl, iface); IBasicVideo* pBasicVideo; HRESULT hr; - TRACE("(%p/%p)->(%ld)\n", This, iface, DestinationTop); + TRACE("(%p/%p)->(%d)\n", This, iface, DestinationTop); EnterCriticalSection(&This->cs); @@ -3429,7 +3429,7 @@ static HRESULT WINAPI BasicVideo_put_DestinationTop(IBasicVideo2 *iface, } static HRESULT WINAPI BasicVideo_get_DestinationTop(IBasicVideo2 *iface, - long *pDestinationTop) { + LONG *pDestinationTop) { ICOM_THIS_MULTI(IFilterGraphImpl, IBasicVideo_vtbl, iface); IBasicVideo* pBasicVideo; HRESULT hr; @@ -3449,12 +3449,12 @@ static HRESULT WINAPI BasicVideo_get_DestinationTop(IBasicVideo2 *iface, } static HRESULT WINAPI BasicVideo_put_DestinationHeight(IBasicVideo2 *iface, - long DestinationHeight) { + LONG DestinationHeight) { ICOM_THIS_MULTI(IFilterGraphImpl, IBasicVideo_vtbl, iface); IBasicVideo* pBasicVideo; HRESULT hr; - TRACE("(%p/%p)->(%ld)\n", This, iface, DestinationHeight); + TRACE("(%p/%p)->(%d)\n", This, iface, DestinationHeight); EnterCriticalSection(&This->cs); @@ -3469,7 +3469,7 @@ static HRESULT WINAPI BasicVideo_put_DestinationHeight(IBasicVideo2 *iface, } static HRESULT WINAPI BasicVideo_get_DestinationHeight(IBasicVideo2 *iface, - long *pDestinationHeight) { + LONG *pDestinationHeight) { ICOM_THIS_MULTI(IFilterGraphImpl, IBasicVideo_vtbl, iface); IBasicVideo* pBasicVideo; HRESULT hr; @@ -3489,15 +3489,15 @@ static HRESULT WINAPI BasicVideo_get_DestinationHeight(IBasicVideo2 *iface, } static HRESULT WINAPI BasicVideo_SetSourcePosition(IBasicVideo2 *iface, - long Left, - long Top, - long Width, - long Height) { + LONG Left, + LONG Top, + LONG Width, + LONG Height) { ICOM_THIS_MULTI(IFilterGraphImpl, IBasicVideo_vtbl, iface); IBasicVideo* pBasicVideo; HRESULT hr; - TRACE("(%p/%p)->(%ld, %ld, %ld, %ld)\n", This, iface, Left, Top, Width, Height); + TRACE("(%p/%p)->(%d, %d, %d, %d)\n", This, iface, Left, Top, Width, Height); EnterCriticalSection(&This->cs); @@ -3512,10 +3512,10 @@ static HRESULT WINAPI BasicVideo_SetSourcePosition(IBasicVideo2 *iface, } static HRESULT WINAPI BasicVideo_GetSourcePosition(IBasicVideo2 *iface, - long *pLeft, - long *pTop, - long *pWidth, - long *pHeight) { + LONG *pLeft, + LONG *pTop, + LONG *pWidth, + LONG *pHeight) { ICOM_THIS_MULTI(IFilterGraphImpl, IBasicVideo_vtbl, iface); IBasicVideo* pBasicVideo; HRESULT hr; @@ -3554,15 +3554,15 @@ static HRESULT WINAPI BasicVideo_SetDefaultSourcePosition(IBasicVideo2 *iface) { } static HRESULT WINAPI BasicVideo_SetDestinationPosition(IBasicVideo2 *iface, - long Left, - long Top, - long Width, - long Height) { + LONG Left, + LONG Top, + LONG Width, + LONG Height) { ICOM_THIS_MULTI(IFilterGraphImpl, IBasicVideo_vtbl, iface); IBasicVideo* pBasicVideo; HRESULT hr; - TRACE("(%p/%p)->(%ld, %ld, %ld, %ld)\n", This, iface, Left, Top, Width, Height); + TRACE("(%p/%p)->(%d, %d, %d, %d)\n", This, iface, Left, Top, Width, Height); EnterCriticalSection(&This->cs); @@ -3577,10 +3577,10 @@ static HRESULT WINAPI BasicVideo_SetDestinationPosition(IBasicVideo2 *iface, } static HRESULT WINAPI BasicVideo_GetDestinationPosition(IBasicVideo2 *iface, - long *pLeft, - long *pTop, - long *pWidth, - long *pHeight) { + LONG *pLeft, + LONG *pTop, + LONG *pWidth, + LONG *pHeight) { ICOM_THIS_MULTI(IFilterGraphImpl, IBasicVideo_vtbl, iface); IBasicVideo* pBasicVideo; HRESULT hr; @@ -3619,8 +3619,8 @@ static HRESULT WINAPI BasicVideo_SetDefaultDestinationPosition(IBasicVideo2 *ifa } static HRESULT WINAPI BasicVideo_GetVideoSize(IBasicVideo2 *iface, - long *pWidth, - long *pHeight) { + LONG *pWidth, + LONG *pHeight) { ICOM_THIS_MULTI(IFilterGraphImpl, IBasicVideo_vtbl, iface); IBasicVideo* pBasicVideo; HRESULT hr; @@ -3640,15 +3640,15 @@ static HRESULT WINAPI BasicVideo_GetVideoSize(IBasicVideo2 *iface, } static HRESULT WINAPI BasicVideo_GetVideoPaletteEntries(IBasicVideo2 *iface, - long StartIndex, - long Entries, - long *pRetrieved, - long *pPalette) { + LONG StartIndex, + LONG Entries, + LONG *pRetrieved, + LONG *pPalette) { ICOM_THIS_MULTI(IFilterGraphImpl, IBasicVideo_vtbl, iface); IBasicVideo* pBasicVideo; HRESULT hr; - TRACE("(%p/%p)->(%ld, %ld, %p, %p)\n", This, iface, StartIndex, Entries, pRetrieved, pPalette); + TRACE("(%p/%p)->(%d, %d, %p, %p)\n", This, iface, StartIndex, Entries, pRetrieved, pPalette); EnterCriticalSection(&This->cs); @@ -3663,8 +3663,8 @@ static HRESULT WINAPI BasicVideo_GetVideoPaletteEntries(IBasicVideo2 *iface, } static HRESULT WINAPI BasicVideo_GetCurrentImage(IBasicVideo2 *iface, - long *pBufferSize, - long *pDIBImage) { + LONG *pBufferSize, + LONG *pDIBImage) { ICOM_THIS_MULTI(IFilterGraphImpl, IBasicVideo_vtbl, iface); IBasicVideo* pBasicVideo; HRESULT hr; @@ -3949,12 +3949,12 @@ static HRESULT WINAPI VideoWindow_get_Caption(IVideoWindow *iface, } static HRESULT WINAPI VideoWindow_put_WindowStyle(IVideoWindow *iface, - long WindowStyle) { + LONG WindowStyle) { ICOM_THIS_MULTI(IFilterGraphImpl, IVideoWindow_vtbl, iface); IVideoWindow* pVideoWindow; HRESULT hr; - TRACE("(%p/%p)->(%ld)\n", This, iface, WindowStyle); + TRACE("(%p/%p)->(%d)\n", This, iface, WindowStyle); EnterCriticalSection(&This->cs); @@ -3969,7 +3969,7 @@ static HRESULT WINAPI VideoWindow_put_WindowStyle(IVideoWindow *iface, } static HRESULT WINAPI VideoWindow_get_WindowStyle(IVideoWindow *iface, - long *WindowStyle) { + LONG *WindowStyle) { ICOM_THIS_MULTI(IFilterGraphImpl, IVideoWindow_vtbl, iface); IVideoWindow* pVideoWindow; HRESULT hr; @@ -3989,12 +3989,12 @@ static HRESULT WINAPI VideoWindow_get_WindowStyle(IVideoWindow *iface, } static HRESULT WINAPI VideoWindow_put_WindowStyleEx(IVideoWindow *iface, - long WindowStyleEx) { + LONG WindowStyleEx) { ICOM_THIS_MULTI(IFilterGraphImpl, IVideoWindow_vtbl, iface); IVideoWindow* pVideoWindow; HRESULT hr; - TRACE("(%p/%p)->(%ld)\n", This, iface, WindowStyleEx); + TRACE("(%p/%p)->(%d)\n", This, iface, WindowStyleEx); EnterCriticalSection(&This->cs); @@ -4009,7 +4009,7 @@ static HRESULT WINAPI VideoWindow_put_WindowStyleEx(IVideoWindow *iface, } static HRESULT WINAPI VideoWindow_get_WindowStyleEx(IVideoWindow *iface, - long *WindowStyleEx) { + LONG *WindowStyleEx) { ICOM_THIS_MULTI(IFilterGraphImpl, IVideoWindow_vtbl, iface); IVideoWindow* pVideoWindow; HRESULT hr; @@ -4029,12 +4029,12 @@ static HRESULT WINAPI VideoWindow_get_WindowStyleEx(IVideoWindow *iface, } static HRESULT WINAPI VideoWindow_put_AutoShow(IVideoWindow *iface, - long AutoShow) { + LONG AutoShow) { ICOM_THIS_MULTI(IFilterGraphImpl, IVideoWindow_vtbl, iface); IVideoWindow* pVideoWindow; HRESULT hr; - TRACE("(%p/%p)->(%ld)\n", This, iface, AutoShow); + TRACE("(%p/%p)->(%d)\n", This, iface, AutoShow); EnterCriticalSection(&This->cs); @@ -4049,7 +4049,7 @@ static HRESULT WINAPI VideoWindow_put_AutoShow(IVideoWindow *iface, } static HRESULT WINAPI VideoWindow_get_AutoShow(IVideoWindow *iface, - long *AutoShow) { + LONG *AutoShow) { ICOM_THIS_MULTI(IFilterGraphImpl, IVideoWindow_vtbl, iface); IVideoWindow* pVideoWindow; HRESULT hr; @@ -4069,12 +4069,12 @@ static HRESULT WINAPI VideoWindow_get_AutoShow(IVideoWindow *iface, } static HRESULT WINAPI VideoWindow_put_WindowState(IVideoWindow *iface, - long WindowState) { + LONG WindowState) { ICOM_THIS_MULTI(IFilterGraphImpl, IVideoWindow_vtbl, iface); IVideoWindow* pVideoWindow; HRESULT hr; - TRACE("(%p/%p)->(%ld)\n", This, iface, WindowState); + TRACE("(%p/%p)->(%d)\n", This, iface, WindowState); EnterCriticalSection(&This->cs); @@ -4089,7 +4089,7 @@ static HRESULT WINAPI VideoWindow_put_WindowState(IVideoWindow *iface, } static HRESULT WINAPI VideoWindow_get_WindowState(IVideoWindow *iface, - long *WindowState) { + LONG *WindowState) { ICOM_THIS_MULTI(IFilterGraphImpl, IVideoWindow_vtbl, iface); IVideoWindow* pVideoWindow; HRESULT hr; @@ -4109,12 +4109,12 @@ static HRESULT WINAPI VideoWindow_get_WindowState(IVideoWindow *iface, } static HRESULT WINAPI VideoWindow_put_BackgroundPalette(IVideoWindow *iface, - long BackgroundPalette) { + LONG BackgroundPalette) { ICOM_THIS_MULTI(IFilterGraphImpl, IVideoWindow_vtbl, iface); IVideoWindow* pVideoWindow; HRESULT hr; - TRACE("(%p/%p)->(%ld)\n", This, iface, BackgroundPalette); + TRACE("(%p/%p)->(%d)\n", This, iface, BackgroundPalette); EnterCriticalSection(&This->cs); @@ -4129,7 +4129,7 @@ static HRESULT WINAPI VideoWindow_put_BackgroundPalette(IVideoWindow *iface, } static HRESULT WINAPI VideoWindow_get_BackgroundPalette(IVideoWindow *iface, - long *pBackgroundPalette) { + LONG *pBackgroundPalette) { ICOM_THIS_MULTI(IFilterGraphImpl, IVideoWindow_vtbl, iface); IVideoWindow* pVideoWindow; HRESULT hr; @@ -4149,12 +4149,12 @@ static HRESULT WINAPI VideoWindow_get_BackgroundPalette(IVideoWindow *iface, } static HRESULT WINAPI VideoWindow_put_Visible(IVideoWindow *iface, - long Visible) { + LONG Visible) { ICOM_THIS_MULTI(IFilterGraphImpl, IVideoWindow_vtbl, iface); IVideoWindow* pVideoWindow; HRESULT hr; - TRACE("(%p/%p)->(%ld)\n", This, iface, Visible); + TRACE("(%p/%p)->(%d)\n", This, iface, Visible); EnterCriticalSection(&This->cs); @@ -4169,7 +4169,7 @@ static HRESULT WINAPI VideoWindow_put_Visible(IVideoWindow *iface, } static HRESULT WINAPI VideoWindow_get_Visible(IVideoWindow *iface, - long *pVisible) { + LONG *pVisible) { ICOM_THIS_MULTI(IFilterGraphImpl, IVideoWindow_vtbl, iface); IVideoWindow* pVideoWindow; HRESULT hr; @@ -4189,12 +4189,12 @@ static HRESULT WINAPI VideoWindow_get_Visible(IVideoWindow *iface, } static HRESULT WINAPI VideoWindow_put_Left(IVideoWindow *iface, - long Left) { + LONG Left) { ICOM_THIS_MULTI(IFilterGraphImpl, IVideoWindow_vtbl, iface); IVideoWindow* pVideoWindow; HRESULT hr; - TRACE("(%p/%p)->(%ld)\n", This, iface, Left); + TRACE("(%p/%p)->(%d)\n", This, iface, Left); EnterCriticalSection(&This->cs); @@ -4209,7 +4209,7 @@ static HRESULT WINAPI VideoWindow_put_Left(IVideoWindow *iface, } static HRESULT WINAPI VideoWindow_get_Left(IVideoWindow *iface, - long *pLeft) { + LONG *pLeft) { ICOM_THIS_MULTI(IFilterGraphImpl, IVideoWindow_vtbl, iface); IVideoWindow* pVideoWindow; HRESULT hr; @@ -4229,12 +4229,12 @@ static HRESULT WINAPI VideoWindow_get_Left(IVideoWindow *iface, } static HRESULT WINAPI VideoWindow_put_Width(IVideoWindow *iface, - long Width) { + LONG Width) { ICOM_THIS_MULTI(IFilterGraphImpl, IVideoWindow_vtbl, iface); IVideoWindow* pVideoWindow; HRESULT hr; - TRACE("(%p/%p)->(%ld)\n", This, iface, Width); + TRACE("(%p/%p)->(%d)\n", This, iface, Width); EnterCriticalSection(&This->cs); @@ -4249,7 +4249,7 @@ static HRESULT WINAPI VideoWindow_put_Width(IVideoWindow *iface, } static HRESULT WINAPI VideoWindow_get_Width(IVideoWindow *iface, - long *pWidth) { + LONG *pWidth) { ICOM_THIS_MULTI(IFilterGraphImpl, IVideoWindow_vtbl, iface); IVideoWindow* pVideoWindow; HRESULT hr; @@ -4269,12 +4269,12 @@ static HRESULT WINAPI VideoWindow_get_Width(IVideoWindow *iface, } static HRESULT WINAPI VideoWindow_put_Top(IVideoWindow *iface, - long Top) { + LONG Top) { ICOM_THIS_MULTI(IFilterGraphImpl, IVideoWindow_vtbl, iface); IVideoWindow* pVideoWindow; HRESULT hr; - TRACE("(%p/%p)->(%ld)\n", This, iface, Top); + TRACE("(%p/%p)->(%d)\n", This, iface, Top); EnterCriticalSection(&This->cs); @@ -4289,7 +4289,7 @@ static HRESULT WINAPI VideoWindow_put_Top(IVideoWindow *iface, } static HRESULT WINAPI VideoWindow_get_Top(IVideoWindow *iface, - long *pTop) { + LONG *pTop) { ICOM_THIS_MULTI(IFilterGraphImpl, IVideoWindow_vtbl, iface); IVideoWindow* pVideoWindow; HRESULT hr; @@ -4309,12 +4309,12 @@ static HRESULT WINAPI VideoWindow_get_Top(IVideoWindow *iface, } static HRESULT WINAPI VideoWindow_put_Height(IVideoWindow *iface, - long Height) { + LONG Height) { ICOM_THIS_MULTI(IFilterGraphImpl, IVideoWindow_vtbl, iface); IVideoWindow* pVideoWindow; HRESULT hr; - TRACE("(%p/%p)->(%ld)\n", This, iface, Height); + TRACE("(%p/%p)->(%d)\n", This, iface, Height); EnterCriticalSection(&This->cs); @@ -4329,7 +4329,7 @@ static HRESULT WINAPI VideoWindow_put_Height(IVideoWindow *iface, } static HRESULT WINAPI VideoWindow_get_Height(IVideoWindow *iface, - long *pHeight) { + LONG *pHeight) { ICOM_THIS_MULTI(IFilterGraphImpl, IVideoWindow_vtbl, iface); IVideoWindow* pVideoWindow; HRESULT hr; @@ -4429,7 +4429,7 @@ static HRESULT WINAPI VideoWindow_get_MessageDrain(IVideoWindow *iface, } static HRESULT WINAPI VideoWindow_get_BorderColor(IVideoWindow *iface, - long *Color) { + LONG *Color) { ICOM_THIS_MULTI(IFilterGraphImpl, IVideoWindow_vtbl, iface); IVideoWindow* pVideoWindow; HRESULT hr; @@ -4449,12 +4449,12 @@ static HRESULT WINAPI VideoWindow_get_BorderColor(IVideoWindow *iface, } static HRESULT WINAPI VideoWindow_put_BorderColor(IVideoWindow *iface, - long Color) { + LONG Color) { ICOM_THIS_MULTI(IFilterGraphImpl, IVideoWindow_vtbl, iface); IVideoWindow* pVideoWindow; HRESULT hr; - TRACE("(%p/%p)->(%ld)\n", This, iface, Color); + TRACE("(%p/%p)->(%d)\n", This, iface, Color); EnterCriticalSection(&This->cs); @@ -4469,7 +4469,7 @@ static HRESULT WINAPI VideoWindow_put_BorderColor(IVideoWindow *iface, } static HRESULT WINAPI VideoWindow_get_FullScreenMode(IVideoWindow *iface, - long *FullScreenMode) { + LONG *FullScreenMode) { ICOM_THIS_MULTI(IFilterGraphImpl, IVideoWindow_vtbl, iface); IVideoWindow* pVideoWindow; HRESULT hr; @@ -4489,12 +4489,12 @@ static HRESULT WINAPI VideoWindow_get_FullScreenMode(IVideoWindow *iface, } static HRESULT WINAPI VideoWindow_put_FullScreenMode(IVideoWindow *iface, - long FullScreenMode) { + LONG FullScreenMode) { ICOM_THIS_MULTI(IFilterGraphImpl, IVideoWindow_vtbl, iface); IVideoWindow* pVideoWindow; HRESULT hr; - TRACE("(%p/%p)->(%ld)\n", This, iface, FullScreenMode); + TRACE("(%p/%p)->(%d)\n", This, iface, FullScreenMode); EnterCriticalSection(&This->cs); @@ -4509,12 +4509,12 @@ static HRESULT WINAPI VideoWindow_put_FullScreenMode(IVideoWindow *iface, } static HRESULT WINAPI VideoWindow_SetWindowForeground(IVideoWindow *iface, - long Focus) { + LONG Focus) { ICOM_THIS_MULTI(IFilterGraphImpl, IVideoWindow_vtbl, iface); IVideoWindow* pVideoWindow; HRESULT hr; - TRACE("(%p/%p)->(%ld)\n", This, iface, Focus); + TRACE("(%p/%p)->(%d)\n", This, iface, Focus); EnterCriticalSection(&This->cs); @@ -4530,14 +4530,14 @@ static HRESULT WINAPI VideoWindow_SetWindowForeground(IVideoWindow *iface, static HRESULT WINAPI VideoWindow_NotifyOwnerMessage(IVideoWindow *iface, OAHWND hwnd, - long uMsg, + LONG uMsg, LONG_PTR wParam, LONG_PTR lParam) { ICOM_THIS_MULTI(IFilterGraphImpl, IVideoWindow_vtbl, iface); IVideoWindow* pVideoWindow; HRESULT hr; - TRACE("(%p/%p)->(%08x, %ld, %08lx, %08lx)\n", This, iface, (DWORD) hwnd, uMsg, wParam, lParam); + TRACE("(%p/%p)->(%08lx, %d, %08lx, %08lx)\n", This, iface, hwnd, uMsg, wParam, lParam); EnterCriticalSection(&This->cs); @@ -4552,15 +4552,15 @@ static HRESULT WINAPI VideoWindow_NotifyOwnerMessage(IVideoWindow *iface, } static HRESULT WINAPI VideoWindow_SetWindowPosition(IVideoWindow *iface, - long Left, - long Top, - long Width, - long Height) { + LONG Left, + LONG Top, + LONG Width, + LONG Height) { ICOM_THIS_MULTI(IFilterGraphImpl, IVideoWindow_vtbl, iface); IVideoWindow* pVideoWindow; HRESULT hr; - - TRACE("(%p/%p)->(%ld, %ld, %ld, %ld)\n", This, iface, Left, Top, Width, Height); + + TRACE("(%p/%p)->(%d, %d, %d, %d)\n", This, iface, Left, Top, Width, Height); EnterCriticalSection(&This->cs); @@ -4575,10 +4575,10 @@ static HRESULT WINAPI VideoWindow_SetWindowPosition(IVideoWindow *iface, } static HRESULT WINAPI VideoWindow_GetWindowPosition(IVideoWindow *iface, - long *pLeft, - long *pTop, - long *pWidth, - long *pHeight) { + LONG *pLeft, + LONG *pTop, + LONG *pWidth, + LONG *pHeight) { ICOM_THIS_MULTI(IFilterGraphImpl, IVideoWindow_vtbl, iface); IVideoWindow* pVideoWindow; HRESULT hr; @@ -4598,8 +4598,8 @@ static HRESULT WINAPI VideoWindow_GetWindowPosition(IVideoWindow *iface, } static HRESULT WINAPI VideoWindow_GetMinIdealImageSize(IVideoWindow *iface, - long *pWidth, - long *pHeight) { + LONG *pWidth, + LONG *pHeight) { ICOM_THIS_MULTI(IFilterGraphImpl, IVideoWindow_vtbl, iface); IVideoWindow* pVideoWindow; HRESULT hr; @@ -4619,8 +4619,8 @@ static HRESULT WINAPI VideoWindow_GetMinIdealImageSize(IVideoWindow *iface, } static HRESULT WINAPI VideoWindow_GetMaxIdealImageSize(IVideoWindow *iface, - long *pWidth, - long *pHeight) { + LONG *pWidth, + LONG *pHeight) { ICOM_THIS_MULTI(IFilterGraphImpl, IVideoWindow_vtbl, iface); IVideoWindow* pVideoWindow; HRESULT hr; @@ -4640,10 +4640,10 @@ static HRESULT WINAPI VideoWindow_GetMaxIdealImageSize(IVideoWindow *iface, } static HRESULT WINAPI VideoWindow_GetRestorePosition(IVideoWindow *iface, - long *pLeft, - long *pTop, - long *pWidth, - long *pHeight) { + LONG *pLeft, + LONG *pTop, + LONG *pWidth, + LONG *pHeight) { ICOM_THIS_MULTI(IFilterGraphImpl, IVideoWindow_vtbl, iface); IVideoWindow* pVideoWindow; HRESULT hr; @@ -4663,12 +4663,12 @@ static HRESULT WINAPI VideoWindow_GetRestorePosition(IVideoWindow *iface, } static HRESULT WINAPI VideoWindow_HideCursor(IVideoWindow *iface, - long HideCursor) { + LONG HideCursor) { ICOM_THIS_MULTI(IFilterGraphImpl, IVideoWindow_vtbl, iface); IVideoWindow* pVideoWindow; HRESULT hr; - TRACE("(%p/%p)->(%ld)\n", This, iface, HideCursor); + TRACE("(%p/%p)->(%d)\n", This, iface, HideCursor); EnterCriticalSection(&This->cs); @@ -4683,7 +4683,7 @@ static HRESULT WINAPI VideoWindow_HideCursor(IVideoWindow *iface, } static HRESULT WINAPI VideoWindow_IsCursorHidden(IVideoWindow *iface, - long *CursorHidden) { + LONG *CursorHidden) { ICOM_THIS_MULTI(IFilterGraphImpl, IVideoWindow_vtbl, iface); IVideoWindow* pVideoWindow; HRESULT hr; @@ -4844,14 +4844,14 @@ static HRESULT WINAPI MediaEvent_GetEventHandle(IMediaEventEx *iface, } static HRESULT WINAPI MediaEvent_GetEvent(IMediaEventEx *iface, - long *lEventCode, + LONG *lEventCode, LONG_PTR *lParam1, LONG_PTR *lParam2, - long msTimeout) { + LONG msTimeout) { ICOM_THIS_MULTI(IFilterGraphImpl, IMediaEventEx_vtbl, iface); Event evt; - TRACE("(%p/%p)->(%p, %p, %p, %ld)\n", This, iface, lEventCode, lParam1, lParam2, msTimeout); + TRACE("(%p/%p)->(%p, %p, %p, %d)\n", This, iface, lEventCode, lParam1, lParam2, msTimeout); if (EventsQueue_GetEvent(&This->evqueue, &evt, msTimeout)) { @@ -4866,11 +4866,11 @@ static HRESULT WINAPI MediaEvent_GetEvent(IMediaEventEx *iface, } static HRESULT WINAPI MediaEvent_WaitForCompletion(IMediaEventEx *iface, - long msTimeout, - long *pEvCode) { + LONG msTimeout, + LONG *pEvCode) { ICOM_THIS_MULTI(IFilterGraphImpl, IMediaEventEx_vtbl, iface); - TRACE("(%p/%p)->(%ld, %p)\n", This, iface, msTimeout, pEvCode); + TRACE("(%p/%p)->(%d, %p)\n", This, iface, msTimeout, pEvCode); if (WaitForSingleObject(This->hEventCompletion, msTimeout) == WAIT_OBJECT_0) { @@ -4883,10 +4883,10 @@ static HRESULT WINAPI MediaEvent_WaitForCompletion(IMediaEventEx *iface, } static HRESULT WINAPI MediaEvent_CancelDefaultHandling(IMediaEventEx *iface, - long lEvCode) { + LONG lEvCode) { ICOM_THIS_MULTI(IFilterGraphImpl, IMediaEventEx_vtbl, iface); - TRACE("(%p/%p)->(%ld)\n", This, iface, lEvCode); + TRACE("(%p/%p)->(%d)\n", This, iface, lEvCode); if (lEvCode == EC_COMPLETE) This->HandleEcComplete = FALSE; @@ -4901,10 +4901,10 @@ static HRESULT WINAPI MediaEvent_CancelDefaultHandling(IMediaEventEx *iface, } static HRESULT WINAPI MediaEvent_RestoreDefaultHandling(IMediaEventEx *iface, - long lEvCode) { + LONG lEvCode) { ICOM_THIS_MULTI(IFilterGraphImpl, IMediaEventEx_vtbl, iface); - TRACE("(%p/%p)->(%ld)\n", This, iface, lEvCode); + TRACE("(%p/%p)->(%d)\n", This, iface, lEvCode); if (lEvCode == EC_COMPLETE) This->HandleEcComplete = TRUE; @@ -4919,12 +4919,12 @@ static HRESULT WINAPI MediaEvent_RestoreDefaultHandling(IMediaEventEx *iface, } static HRESULT WINAPI MediaEvent_FreeEventParams(IMediaEventEx *iface, - long lEvCode, + LONG lEvCode, LONG_PTR lParam1, LONG_PTR lParam2) { ICOM_THIS_MULTI(IFilterGraphImpl, IMediaEventEx_vtbl, iface); - TRACE("(%p/%p)->(%ld, %08lx, %08lx): stub !!!\n", This, iface, lEvCode, lParam1, lParam2); + TRACE("(%p/%p)->(%d, %08lx, %08lx): stub !!!\n", This, iface, lEvCode, lParam1, lParam2); return S_OK; } @@ -4932,11 +4932,11 @@ static HRESULT WINAPI MediaEvent_FreeEventParams(IMediaEventEx *iface, /*** IMediaEventEx methods ***/ static HRESULT WINAPI MediaEvent_SetNotifyWindow(IMediaEventEx *iface, OAHWND hwnd, - long lMsg, + LONG lMsg, LONG_PTR lInstanceData) { ICOM_THIS_MULTI(IFilterGraphImpl, IMediaEventEx_vtbl, iface); - TRACE("(%p/%p)->(%08x, %ld, %08lx)\n", This, iface, (DWORD) hwnd, lMsg, lInstanceData); + TRACE("(%p/%p)->(%08lx, %d, %08lx)\n", This, iface, hwnd, lMsg, lInstanceData); This->notif.hWnd = (HWND)hwnd; This->notif.msg = lMsg; @@ -4946,10 +4946,10 @@ static HRESULT WINAPI MediaEvent_SetNotifyWindow(IMediaEventEx *iface, } static HRESULT WINAPI MediaEvent_SetNotifyFlags(IMediaEventEx *iface, - long lNoNotifyFlags) { + LONG lNoNotifyFlags) { ICOM_THIS_MULTI(IFilterGraphImpl, IMediaEventEx_vtbl, iface); - TRACE("(%p/%p)->(%ld)\n", This, iface, lNoNotifyFlags); + TRACE("(%p/%p)->(%d)\n", This, iface, lNoNotifyFlags); if ((lNoNotifyFlags != 0) && (lNoNotifyFlags != 1)) return E_INVALIDARG; @@ -4960,7 +4960,7 @@ static HRESULT WINAPI MediaEvent_SetNotifyFlags(IMediaEventEx *iface, } static HRESULT WINAPI MediaEvent_GetNotifyFlags(IMediaEventEx *iface, - long *lplNoNotifyFlags) { + LONG *lplNoNotifyFlags) { ICOM_THIS_MULTI(IFilterGraphImpl, IMediaEventEx_vtbl, iface); TRACE("(%p/%p)->(%p)\n", This, iface, lplNoNotifyFlags); diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index ae2a7bd0907..b31959eed21 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -1184,7 +1184,7 @@ static HRESULT WINAPI Basicvideo_get_AvgTimePerFrame(IBasicVideo *iface, } static HRESULT WINAPI Basicvideo_get_BitRate(IBasicVideo *iface, - long *pBitRate) { + LONG *pBitRate) { ICOM_THIS_MULTI(VideoRendererImpl, IBasicVideo_vtbl, iface); FIXME("(%p/%p)->(%p): stub !!!\n", This, iface, pBitRate); @@ -1193,7 +1193,7 @@ static HRESULT WINAPI Basicvideo_get_BitRate(IBasicVideo *iface, } static HRESULT WINAPI Basicvideo_get_BitErrorRate(IBasicVideo *iface, - long *pBitErrorRate) { + LONG *pBitErrorRate) { ICOM_THIS_MULTI(VideoRendererImpl, IBasicVideo_vtbl, iface); FIXME("(%p/%p)->(%p): stub !!!\n", This, iface, pBitErrorRate); @@ -1202,7 +1202,7 @@ static HRESULT WINAPI Basicvideo_get_BitErrorRate(IBasicVideo *iface, } static HRESULT WINAPI Basicvideo_get_VideoWidth(IBasicVideo *iface, - long *pVideoWidth) { + LONG *pVideoWidth) { ICOM_THIS_MULTI(VideoRendererImpl, IBasicVideo_vtbl, iface); TRACE("(%p/%p)->(%p)\n", This, iface, pVideoWidth); @@ -1213,7 +1213,7 @@ static HRESULT WINAPI Basicvideo_get_VideoWidth(IBasicVideo *iface, } static HRESULT WINAPI Basicvideo_get_VideoHeight(IBasicVideo *iface, - long *pVideoHeight) { + LONG *pVideoHeight) { ICOM_THIS_MULTI(VideoRendererImpl, IBasicVideo_vtbl, iface); TRACE("(%p/%p)->(%p)\n", This, iface, pVideoHeight); @@ -1224,10 +1224,10 @@ static HRESULT WINAPI Basicvideo_get_VideoHeight(IBasicVideo *iface, } static HRESULT WINAPI Basicvideo_put_SourceLeft(IBasicVideo *iface, - long SourceLeft) { + LONG SourceLeft) { ICOM_THIS_MULTI(VideoRendererImpl, IBasicVideo_vtbl, iface); - TRACE("(%p/%p)->(%ld)\n", This, iface, SourceLeft); + TRACE("(%p/%p)->(%d)\n", This, iface, SourceLeft); This->SourceRect.left = SourceLeft; @@ -1235,7 +1235,7 @@ static HRESULT WINAPI Basicvideo_put_SourceLeft(IBasicVideo *iface, } static HRESULT WINAPI Basicvideo_get_SourceLeft(IBasicVideo *iface, - long *pSourceLeft) { + LONG *pSourceLeft) { ICOM_THIS_MULTI(VideoRendererImpl, IBasicVideo_vtbl, iface); TRACE("(%p/%p)->(%p)\n", This, iface, pSourceLeft); @@ -1246,10 +1246,10 @@ static HRESULT WINAPI Basicvideo_get_SourceLeft(IBasicVideo *iface, } static HRESULT WINAPI Basicvideo_put_SourceWidth(IBasicVideo *iface, - long SourceWidth) { + LONG SourceWidth) { ICOM_THIS_MULTI(VideoRendererImpl, IBasicVideo_vtbl, iface); - TRACE("(%p/%p)->(%ld)\n", This, iface, SourceWidth); + TRACE("(%p/%p)->(%d)\n", This, iface, SourceWidth); This->SourceRect.right = This->SourceRect.left + SourceWidth; @@ -1257,7 +1257,7 @@ static HRESULT WINAPI Basicvideo_put_SourceWidth(IBasicVideo *iface, } static HRESULT WINAPI Basicvideo_get_SourceWidth(IBasicVideo *iface, - long *pSourceWidth) { + LONG *pSourceWidth) { ICOM_THIS_MULTI(VideoRendererImpl, IBasicVideo_vtbl, iface); TRACE("(%p/%p)->(%p)\n", This, iface, pSourceWidth); @@ -1268,10 +1268,10 @@ static HRESULT WINAPI Basicvideo_get_SourceWidth(IBasicVideo *iface, } static HRESULT WINAPI Basicvideo_put_SourceTop(IBasicVideo *iface, - long SourceTop) { + LONG SourceTop) { ICOM_THIS_MULTI(VideoRendererImpl, IBasicVideo_vtbl, iface); - TRACE("(%p/%p)->(%ld)\n", This, iface, SourceTop); + TRACE("(%p/%p)->(%d)\n", This, iface, SourceTop); This->SourceRect.top = SourceTop; @@ -1279,7 +1279,7 @@ static HRESULT WINAPI Basicvideo_put_SourceTop(IBasicVideo *iface, } static HRESULT WINAPI Basicvideo_get_SourceTop(IBasicVideo *iface, - long *pSourceTop) { + LONG *pSourceTop) { ICOM_THIS_MULTI(VideoRendererImpl, IBasicVideo_vtbl, iface); TRACE("(%p/%p)->(%p)\n", This, iface, pSourceTop); @@ -1290,10 +1290,10 @@ static HRESULT WINAPI Basicvideo_get_SourceTop(IBasicVideo *iface, } static HRESULT WINAPI Basicvideo_put_SourceHeight(IBasicVideo *iface, - long SourceHeight) { + LONG SourceHeight) { ICOM_THIS_MULTI(VideoRendererImpl, IBasicVideo_vtbl, iface); - TRACE("(%p/%p)->(%ld)\n", This, iface, SourceHeight); + TRACE("(%p/%p)->(%d)\n", This, iface, SourceHeight); This->SourceRect.bottom = This->SourceRect.top + SourceHeight; @@ -1301,7 +1301,7 @@ static HRESULT WINAPI Basicvideo_put_SourceHeight(IBasicVideo *iface, } static HRESULT WINAPI Basicvideo_get_SourceHeight(IBasicVideo *iface, - long *pSourceHeight) { + LONG *pSourceHeight) { ICOM_THIS_MULTI(VideoRendererImpl, IBasicVideo_vtbl, iface); TRACE("(%p/%p)->(%p)\n", This, iface, pSourceHeight); @@ -1312,10 +1312,10 @@ static HRESULT WINAPI Basicvideo_get_SourceHeight(IBasicVideo *iface, } static HRESULT WINAPI Basicvideo_put_DestinationLeft(IBasicVideo *iface, - long DestinationLeft) { + LONG DestinationLeft) { ICOM_THIS_MULTI(VideoRendererImpl, IBasicVideo_vtbl, iface); - TRACE("(%p/%p)->(%ld)\n", This, iface, DestinationLeft); + TRACE("(%p/%p)->(%d)\n", This, iface, DestinationLeft); This->DestRect.left = DestinationLeft; @@ -1323,7 +1323,7 @@ static HRESULT WINAPI Basicvideo_put_DestinationLeft(IBasicVideo *iface, } static HRESULT WINAPI Basicvideo_get_DestinationLeft(IBasicVideo *iface, - long *pDestinationLeft) { + LONG *pDestinationLeft) { ICOM_THIS_MULTI(VideoRendererImpl, IBasicVideo_vtbl, iface); TRACE("(%p/%p)->(%p)\n", This, iface, pDestinationLeft); @@ -1334,10 +1334,10 @@ static HRESULT WINAPI Basicvideo_get_DestinationLeft(IBasicVideo *iface, } static HRESULT WINAPI Basicvideo_put_DestinationWidth(IBasicVideo *iface, - long DestinationWidth) { + LONG DestinationWidth) { ICOM_THIS_MULTI(VideoRendererImpl, IBasicVideo_vtbl, iface); - TRACE("(%p/%p)->(%ld)\n", This, iface, DestinationWidth); + TRACE("(%p/%p)->(%d)\n", This, iface, DestinationWidth); This->DestRect.right = This->DestRect.left + DestinationWidth; @@ -1345,7 +1345,7 @@ static HRESULT WINAPI Basicvideo_put_DestinationWidth(IBasicVideo *iface, } static HRESULT WINAPI Basicvideo_get_DestinationWidth(IBasicVideo *iface, - long *pDestinationWidth) { + LONG *pDestinationWidth) { ICOM_THIS_MULTI(VideoRendererImpl, IBasicVideo_vtbl, iface); TRACE("(%p/%p)->(%p)\n", This, iface, pDestinationWidth); @@ -1356,10 +1356,10 @@ static HRESULT WINAPI Basicvideo_get_DestinationWidth(IBasicVideo *iface, } static HRESULT WINAPI Basicvideo_put_DestinationTop(IBasicVideo *iface, - long DestinationTop) { + LONG DestinationTop) { ICOM_THIS_MULTI(VideoRendererImpl, IBasicVideo_vtbl, iface); - TRACE("(%p/%p)->(%ld)\n", This, iface, DestinationTop); + TRACE("(%p/%p)->(%d)\n", This, iface, DestinationTop); This->DestRect.top = DestinationTop; @@ -1367,7 +1367,7 @@ static HRESULT WINAPI Basicvideo_put_DestinationTop(IBasicVideo *iface, } static HRESULT WINAPI Basicvideo_get_DestinationTop(IBasicVideo *iface, - long *pDestinationTop) { + LONG *pDestinationTop) { ICOM_THIS_MULTI(VideoRendererImpl, IBasicVideo_vtbl, iface); TRACE("(%p/%p)->(%p)\n", This, iface, pDestinationTop); @@ -1378,10 +1378,10 @@ static HRESULT WINAPI Basicvideo_get_DestinationTop(IBasicVideo *iface, } static HRESULT WINAPI Basicvideo_put_DestinationHeight(IBasicVideo *iface, - long DestinationHeight) { + LONG DestinationHeight) { ICOM_THIS_MULTI(VideoRendererImpl, IBasicVideo_vtbl, iface); - TRACE("(%p/%p)->(%ld)\n", This, iface, DestinationHeight); + TRACE("(%p/%p)->(%d)\n", This, iface, DestinationHeight); This->DestRect.right = This->DestRect.left + DestinationHeight; @@ -1389,7 +1389,7 @@ static HRESULT WINAPI Basicvideo_put_DestinationHeight(IBasicVideo *iface, } static HRESULT WINAPI Basicvideo_get_DestinationHeight(IBasicVideo *iface, - long *pDestinationHeight) { + LONG *pDestinationHeight) { ICOM_THIS_MULTI(VideoRendererImpl, IBasicVideo_vtbl, iface); TRACE("(%p/%p)->(%p)\n", This, iface, pDestinationHeight); @@ -1400,13 +1400,13 @@ static HRESULT WINAPI Basicvideo_get_DestinationHeight(IBasicVideo *iface, } static HRESULT WINAPI Basicvideo_SetSourcePosition(IBasicVideo *iface, - long Left, - long Top, - long Width, - long Height) { + LONG Left, + LONG Top, + LONG Width, + LONG Height) { ICOM_THIS_MULTI(VideoRendererImpl, IBasicVideo_vtbl, iface); - TRACE("(%p/%p)->(%ld, %ld, %ld, %ld)\n", This, iface, Left, Top, Width, Height); + TRACE("(%p/%p)->(%d, %d, %d, %d)\n", This, iface, Left, Top, Width, Height); This->SourceRect.left = Left; This->SourceRect.top = Top; @@ -1417,10 +1417,10 @@ static HRESULT WINAPI Basicvideo_SetSourcePosition(IBasicVideo *iface, } static HRESULT WINAPI Basicvideo_GetSourcePosition(IBasicVideo *iface, - long *pLeft, - long *pTop, - long *pWidth, - long *pHeight) { + LONG *pLeft, + LONG *pTop, + LONG *pWidth, + LONG *pHeight) { ICOM_THIS_MULTI(VideoRendererImpl, IBasicVideo_vtbl, iface); TRACE("(%p/%p)->(%p, %p, %p, %p)\n", This, iface, pLeft, pTop, pWidth, pHeight); @@ -1447,13 +1447,13 @@ static HRESULT WINAPI Basicvideo_SetDefaultSourcePosition(IBasicVideo *iface) { } static HRESULT WINAPI Basicvideo_SetDestinationPosition(IBasicVideo *iface, - long Left, - long Top, - long Width, - long Height) { + LONG Left, + LONG Top, + LONG Width, + LONG Height) { ICOM_THIS_MULTI(VideoRendererImpl, IBasicVideo_vtbl, iface); - TRACE("(%p/%p)->(%ld, %ld, %ld, %ld)\n", This, iface, Left, Top, Width, Height); + TRACE("(%p/%p)->(%d, %d, %d, %d)\n", This, iface, Left, Top, Width, Height); This->DestRect.left = Left; This->DestRect.top = Top; @@ -1464,10 +1464,10 @@ static HRESULT WINAPI Basicvideo_SetDestinationPosition(IBasicVideo *iface, } static HRESULT WINAPI Basicvideo_GetDestinationPosition(IBasicVideo *iface, - long *pLeft, - long *pTop, - long *pWidth, - long *pHeight) { + LONG *pLeft, + LONG *pTop, + LONG *pWidth, + LONG *pHeight) { ICOM_THIS_MULTI(VideoRendererImpl, IBasicVideo_vtbl, iface); TRACE("(%p/%p)->(%p, %p, %p, %p)\n", This, iface, pLeft, pTop, pWidth, pHeight); @@ -1498,8 +1498,8 @@ static HRESULT WINAPI Basicvideo_SetDefaultDestinationPosition(IBasicVideo *ifac } static HRESULT WINAPI Basicvideo_GetVideoSize(IBasicVideo *iface, - long *pWidth, - long *pHeight) { + LONG *pWidth, + LONG *pHeight) { ICOM_THIS_MULTI(VideoRendererImpl, IBasicVideo_vtbl, iface); TRACE("(%p/%p)->(%p, %p)\n", This, iface, pWidth, pHeight); @@ -1511,20 +1511,20 @@ static HRESULT WINAPI Basicvideo_GetVideoSize(IBasicVideo *iface, } static HRESULT WINAPI Basicvideo_GetVideoPaletteEntries(IBasicVideo *iface, - long StartIndex, - long Entries, - long *pRetrieved, - long *pPalette) { + LONG StartIndex, + LONG Entries, + LONG *pRetrieved, + LONG *pPalette) { ICOM_THIS_MULTI(VideoRendererImpl, IBasicVideo_vtbl, iface); - FIXME("(%p/%p)->(%ld, %ld, %p, %p): stub !!!\n", This, iface, StartIndex, Entries, pRetrieved, pPalette); + FIXME("(%p/%p)->(%d, %d, %p, %p): stub !!!\n", This, iface, StartIndex, Entries, pRetrieved, pPalette); return S_OK; } static HRESULT WINAPI Basicvideo_GetCurrentImage(IBasicVideo *iface, - long *pBufferSize, - long *pDIBImage) { + LONG *pBufferSize, + LONG *pDIBImage) { ICOM_THIS_MULTI(VideoRendererImpl, IBasicVideo_vtbl, iface); BITMAPINFOHEADER *bmiHeader; LONG needed_size; @@ -1568,7 +1568,7 @@ static HRESULT WINAPI Basicvideo_GetCurrentImage(IBasicVideo *iface, if (needed_size < *pBufferSize) { - ERR("Buffer too small %u/%lu\n", needed_size, *pBufferSize); + ERR("Buffer too small %u/%u\n", needed_size, *pBufferSize); LeaveCriticalSection(&This->csFilter); return E_FAIL; } @@ -1746,13 +1746,13 @@ static HRESULT WINAPI Videowindow_get_Caption(IVideoWindow *iface, } static HRESULT WINAPI Videowindow_put_WindowStyle(IVideoWindow *iface, - long WindowStyle) { + LONG WindowStyle) { ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface); LONG old; old = GetWindowLongA(This->hWnd, GWL_STYLE); - - TRACE("(%p/%p)->(%x -> %lx)\n", This, iface, old, WindowStyle); + + TRACE("(%p/%p)->(%x -> %x)\n", This, iface, old, WindowStyle); if (WindowStyle & (WS_DISABLED|WS_HSCROLL|WS_ICONIC|WS_MAXIMIZE|WS_MINIMIZE|WS_VSCROLL)) return E_INVALIDARG; @@ -1763,7 +1763,7 @@ static HRESULT WINAPI Videowindow_put_WindowStyle(IVideoWindow *iface, } static HRESULT WINAPI Videowindow_get_WindowStyle(IVideoWindow *iface, - long *WindowStyle) { + LONG *WindowStyle) { ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface); TRACE("(%p/%p)->(%p)\n", This, iface, WindowStyle); @@ -1774,10 +1774,10 @@ static HRESULT WINAPI Videowindow_get_WindowStyle(IVideoWindow *iface, } static HRESULT WINAPI Videowindow_put_WindowStyleEx(IVideoWindow *iface, - long WindowStyleEx) { + LONG WindowStyleEx) { ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface); - TRACE("(%p/%p)->(%ld)\n", This, iface, WindowStyleEx); + TRACE("(%p/%p)->(%d)\n", This, iface, WindowStyleEx); if (WindowStyleEx & (WS_DISABLED|WS_HSCROLL|WS_ICONIC|WS_MAXIMIZE|WS_MINIMIZE|WS_VSCROLL)) return E_INVALIDARG; @@ -1789,7 +1789,7 @@ static HRESULT WINAPI Videowindow_put_WindowStyleEx(IVideoWindow *iface, } static HRESULT WINAPI Videowindow_get_WindowStyleEx(IVideoWindow *iface, - long *WindowStyleEx) { + LONG *WindowStyleEx) { ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface); TRACE("(%p/%p)->(%p)\n", This, iface, WindowStyleEx); @@ -1800,10 +1800,10 @@ static HRESULT WINAPI Videowindow_get_WindowStyleEx(IVideoWindow *iface, } static HRESULT WINAPI Videowindow_put_AutoShow(IVideoWindow *iface, - long AutoShow) { + LONG AutoShow) { ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface); - TRACE("(%p/%p)->(%ld)\n", This, iface, AutoShow); + TRACE("(%p/%p)->(%d)\n", This, iface, AutoShow); This->AutoShow = 1; /* FIXME: Should be AutoShow */; @@ -1811,7 +1811,7 @@ static HRESULT WINAPI Videowindow_put_AutoShow(IVideoWindow *iface, } static HRESULT WINAPI Videowindow_get_AutoShow(IVideoWindow *iface, - long *AutoShow) { + LONG *AutoShow) { ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface); TRACE("(%p/%p)->(%p)\n", This, iface, AutoShow); @@ -1822,16 +1822,16 @@ static HRESULT WINAPI Videowindow_get_AutoShow(IVideoWindow *iface, } static HRESULT WINAPI Videowindow_put_WindowState(IVideoWindow *iface, - long WindowState) { + LONG WindowState) { ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface); - FIXME("(%p/%p)->(%ld): stub !!!\n", This, iface, WindowState); + FIXME("(%p/%p)->(%d): stub !!!\n", This, iface, WindowState); return S_OK; } static HRESULT WINAPI Videowindow_get_WindowState(IVideoWindow *iface, - long *WindowState) { + LONG *WindowState) { ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface); FIXME("(%p/%p)->(%p): stub !!!\n", This, iface, WindowState); @@ -1840,16 +1840,16 @@ static HRESULT WINAPI Videowindow_get_WindowState(IVideoWindow *iface, } static HRESULT WINAPI Videowindow_put_BackgroundPalette(IVideoWindow *iface, - long BackgroundPalette) { + LONG BackgroundPalette) { ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface); - FIXME("(%p/%p)->(%ld): stub !!!\n", This, iface, BackgroundPalette); + FIXME("(%p/%p)->(%d): stub !!!\n", This, iface, BackgroundPalette); return S_OK; } static HRESULT WINAPI Videowindow_get_BackgroundPalette(IVideoWindow *iface, - long *pBackgroundPalette) { + LONG *pBackgroundPalette) { ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface); FIXME("(%p/%p)->(%p): stub !!!\n", This, iface, pBackgroundPalette); @@ -1858,10 +1858,10 @@ static HRESULT WINAPI Videowindow_get_BackgroundPalette(IVideoWindow *iface, } static HRESULT WINAPI Videowindow_put_Visible(IVideoWindow *iface, - long Visible) { + LONG Visible) { ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface); - TRACE("(%p/%p)->(%ld)\n", This, iface, Visible); + TRACE("(%p/%p)->(%d)\n", This, iface, Visible); ShowWindow(This->hWnd, Visible ? SW_SHOW : SW_HIDE); @@ -1869,7 +1869,7 @@ static HRESULT WINAPI Videowindow_put_Visible(IVideoWindow *iface, } static HRESULT WINAPI Videowindow_get_Visible(IVideoWindow *iface, - long *pVisible) { + LONG *pVisible) { ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface); TRACE("(%p/%p)->(%p)\n", This, iface, pVisible); @@ -1880,10 +1880,10 @@ static HRESULT WINAPI Videowindow_get_Visible(IVideoWindow *iface, } static HRESULT WINAPI Videowindow_put_Left(IVideoWindow *iface, - long Left) { + LONG Left) { ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface); - TRACE("(%p/%p)->(%ld)\n", This, iface, Left); + TRACE("(%p/%p)->(%d)\n", This, iface, Left); if (!SetWindowPos(This->hWnd, NULL, Left, This->WindowPos.top, 0, 0, SWP_NOZORDER|SWP_NOSIZE)) return E_FAIL; @@ -1894,7 +1894,7 @@ static HRESULT WINAPI Videowindow_put_Left(IVideoWindow *iface, } static HRESULT WINAPI Videowindow_get_Left(IVideoWindow *iface, - long *pLeft) { + LONG *pLeft) { ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface); TRACE("(%p/%p)->(%p)\n", This, iface, pLeft); @@ -1905,10 +1905,10 @@ static HRESULT WINAPI Videowindow_get_Left(IVideoWindow *iface, } static HRESULT WINAPI Videowindow_put_Width(IVideoWindow *iface, - long Width) { + LONG Width) { ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface); - TRACE("(%p/%p)->(%ld)\n", This, iface, Width); + TRACE("(%p/%p)->(%d)\n", This, iface, Width); if (!SetWindowPos(This->hWnd, NULL, 0, 0, Width, This->WindowPos.bottom-This->WindowPos.top, SWP_NOZORDER|SWP_NOMOVE)) return E_FAIL; @@ -1919,7 +1919,7 @@ static HRESULT WINAPI Videowindow_put_Width(IVideoWindow *iface, } static HRESULT WINAPI Videowindow_get_Width(IVideoWindow *iface, - long *pWidth) { + LONG *pWidth) { ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface); TRACE("(%p/%p)->(%p)\n", This, iface, pWidth); @@ -1930,10 +1930,10 @@ static HRESULT WINAPI Videowindow_get_Width(IVideoWindow *iface, } static HRESULT WINAPI Videowindow_put_Top(IVideoWindow *iface, - long Top) { + LONG Top) { ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface); - TRACE("(%p/%p)->(%ld)\n", This, iface, Top); + TRACE("(%p/%p)->(%d)\n", This, iface, Top); if (!SetWindowPos(This->hWnd, NULL, This->WindowPos.left, Top, 0, 0, SWP_NOZORDER|SWP_NOSIZE)) return E_FAIL; @@ -1944,7 +1944,7 @@ static HRESULT WINAPI Videowindow_put_Top(IVideoWindow *iface, } static HRESULT WINAPI Videowindow_get_Top(IVideoWindow *iface, - long *pTop) { + LONG *pTop) { ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface); TRACE("(%p/%p)->(%p)\n", This, iface, pTop); @@ -1955,10 +1955,10 @@ static HRESULT WINAPI Videowindow_get_Top(IVideoWindow *iface, } static HRESULT WINAPI Videowindow_put_Height(IVideoWindow *iface, - long Height) { + LONG Height) { ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface); - TRACE("(%p/%p)->(%ld)\n", This, iface, Height); + TRACE("(%p/%p)->(%d)\n", This, iface, Height); if (!SetWindowPos(This->hWnd, NULL, 0, 0, This->WindowPos.right-This->WindowPos.left, Height, SWP_NOZORDER|SWP_NOMOVE)) return E_FAIL; @@ -1969,7 +1969,7 @@ static HRESULT WINAPI Videowindow_put_Height(IVideoWindow *iface, } static HRESULT WINAPI Videowindow_get_Height(IVideoWindow *iface, - long *pHeight) { + LONG *pHeight) { ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface); TRACE("(%p/%p)->(%p)\n", This, iface, pHeight); @@ -2024,7 +2024,7 @@ static HRESULT WINAPI Videowindow_get_MessageDrain(IVideoWindow *iface, } static HRESULT WINAPI Videowindow_get_BorderColor(IVideoWindow *iface, - long *Color) { + LONG *Color) { ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface); FIXME("(%p/%p)->(%p): stub !!!\n", This, iface, Color); @@ -2033,16 +2033,16 @@ static HRESULT WINAPI Videowindow_get_BorderColor(IVideoWindow *iface, } static HRESULT WINAPI Videowindow_put_BorderColor(IVideoWindow *iface, - long Color) { + LONG Color) { ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface); - FIXME("(%p/%p)->(%ld): stub !!!\n", This, iface, Color); + FIXME("(%p/%p)->(%d): stub !!!\n", This, iface, Color); return S_OK; } static HRESULT WINAPI Videowindow_get_FullScreenMode(IVideoWindow *iface, - long *FullScreenMode) { + LONG *FullScreenMode) { ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface); FIXME("(%p/%p)->(%p): stub !!!\n", This, iface, FullScreenMode); @@ -2051,22 +2051,22 @@ static HRESULT WINAPI Videowindow_get_FullScreenMode(IVideoWindow *iface, } static HRESULT WINAPI Videowindow_put_FullScreenMode(IVideoWindow *iface, - long FullScreenMode) { + LONG FullScreenMode) { ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface); - FIXME("(%p/%p)->(%ld): stub !!!\n", This, iface, FullScreenMode); + FIXME("(%p/%p)->(%d): stub !!!\n", This, iface, FullScreenMode); return S_OK; } static HRESULT WINAPI Videowindow_SetWindowForeground(IVideoWindow *iface, - long Focus) { + LONG Focus) { ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface); BOOL ret; IPin* pPin; HRESULT hr; - TRACE("(%p/%p)->(%ld)\n", This, iface, Focus); + TRACE("(%p/%p)->(%d)\n", This, iface, Focus); if ((Focus != FALSE) && (Focus != TRUE)) return E_INVALIDARG; @@ -2088,12 +2088,12 @@ static HRESULT WINAPI Videowindow_SetWindowForeground(IVideoWindow *iface, static HRESULT WINAPI Videowindow_NotifyOwnerMessage(IVideoWindow *iface, OAHWND hwnd, - long uMsg, + LONG uMsg, LONG_PTR wParam, LONG_PTR lParam) { ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface); - TRACE("(%p/%p)->(%08x, %ld, %08lx, %08lx)\n", This, iface, (DWORD) hwnd, uMsg, wParam, lParam); + TRACE("(%p/%p)->(%08lx, %d, %08lx, %08lx)\n", This, iface, hwnd, uMsg, wParam, lParam); if (!PostMessageA(This->hWnd, uMsg, wParam, lParam)) return E_FAIL; @@ -2102,13 +2102,13 @@ static HRESULT WINAPI Videowindow_NotifyOwnerMessage(IVideoWindow *iface, } static HRESULT WINAPI Videowindow_SetWindowPosition(IVideoWindow *iface, - long Left, - long Top, - long Width, - long Height) { + LONG Left, + LONG Top, + LONG Width, + LONG Height) { ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface); - - TRACE("(%p/%p)->(%ld, %ld, %ld, %ld)\n", This, iface, Left, Top, Width, Height); + + TRACE("(%p/%p)->(%d, %d, %d, %d)\n", This, iface, Left, Top, Width, Height); if (!SetWindowPos(This->hWnd, NULL, Left, Top, Width, Height, SWP_NOZORDER)) return E_FAIL; @@ -2122,10 +2122,10 @@ static HRESULT WINAPI Videowindow_SetWindowPosition(IVideoWindow *iface, } static HRESULT WINAPI Videowindow_GetWindowPosition(IVideoWindow *iface, - long *pLeft, - long *pTop, - long *pWidth, - long *pHeight) { + LONG *pLeft, + LONG *pTop, + LONG *pWidth, + LONG *pHeight) { ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface); TRACE("(%p/%p)->(%p, %p, %p, %p)\n", This, iface, pLeft, pTop, pWidth, pHeight); @@ -2139,8 +2139,8 @@ static HRESULT WINAPI Videowindow_GetWindowPosition(IVideoWindow *iface, } static HRESULT WINAPI Videowindow_GetMinIdealImageSize(IVideoWindow *iface, - long *pWidth, - long *pHeight) { + LONG *pWidth, + LONG *pHeight) { ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface); FIXME("(%p/%p)->(%p, %p): semi stub !!!\n", This, iface, pWidth, pHeight); @@ -2152,8 +2152,8 @@ static HRESULT WINAPI Videowindow_GetMinIdealImageSize(IVideoWindow *iface, } static HRESULT WINAPI Videowindow_GetMaxIdealImageSize(IVideoWindow *iface, - long *pWidth, - long *pHeight) { + LONG *pWidth, + LONG *pHeight) { ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface); FIXME("(%p/%p)->(%p, %p): semi stub !!!\n", This, iface, pWidth, pHeight); @@ -2165,10 +2165,10 @@ static HRESULT WINAPI Videowindow_GetMaxIdealImageSize(IVideoWindow *iface, } static HRESULT WINAPI Videowindow_GetRestorePosition(IVideoWindow *iface, - long *pLeft, - long *pTop, - long *pWidth, - long *pHeight) { + LONG *pLeft, + LONG *pTop, + LONG *pWidth, + LONG *pHeight) { ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface); FIXME("(%p/%p)->(%p, %p, %p, %p): stub !!!\n", This, iface, pLeft, pTop, pWidth, pHeight); @@ -2177,16 +2177,16 @@ static HRESULT WINAPI Videowindow_GetRestorePosition(IVideoWindow *iface, } static HRESULT WINAPI Videowindow_HideCursor(IVideoWindow *iface, - long HideCursor) { + LONG HideCursor) { ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface); - FIXME("(%p/%p)->(%ld): stub !!!\n", This, iface, HideCursor); + FIXME("(%p/%p)->(%d): stub !!!\n", This, iface, HideCursor); return S_OK; } static HRESULT WINAPI Videowindow_IsCursorHidden(IVideoWindow *iface, - long *CursorHidden) { + LONG *CursorHidden) { ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface); FIXME("(%p/%p)->(%p): stub !!!\n", This, iface, CursorHidden); diff --git a/include/control.idl b/include/control.idl index ddb52795b60..7d1c83b92c3 100644 --- a/include/control.idl +++ b/include/control.idl @@ -27,7 +27,7 @@ interface IMediaEvent; interface IMediaEventEx; interface IMediaPosition; -typedef long OAFilterState; +typedef LONG OAFilterState; typedef LONG_PTR OAHWND; typedef LONG_PTR OAEVENT; @@ -68,10 +68,10 @@ interface IMediaControl : IDispatch ] interface IBasicAudio : IDispatch { - [propput] HRESULT Volume( [in] long lVolume ); - [propget] HRESULT Volume( [out] long *plVolume ); - [propput] HRESULT Balance( [in] long lBalance ); - [propget] HRESULT Balance( [out] long *plBalance ); + [propput] HRESULT Volume( [in] LONG lVolume ); + [propget] HRESULT Volume( [out] LONG *plVolume ); + [propput] HRESULT Balance( [in] LONG lBalance ); + [propget] HRESULT Balance( [out] LONG *plBalance ); } @@ -87,43 +87,43 @@ interface IVideoWindow : IDispatch { [propput] HRESULT Caption( [in] BSTR strCaption ); [propget] HRESULT Caption( [out] BSTR *strCaption ); - [propput] HRESULT WindowStyle( [in] long WindowStyle ); - [propget] HRESULT WindowStyle( [out] long *WindowStyle ); - [propput] HRESULT WindowStyleEx( [in] long WindowStyleEx ); - [propget] HRESULT WindowStyleEx( [out] long *WindowStyleEx ); - [propput] HRESULT AutoShow( [in] long AutoShow ); - [propget] HRESULT AutoShow( [out] long *AutoShow ); - [propput] HRESULT WindowState( [in] long WindowState ); - [propget] HRESULT WindowState( [out] long *WindowState ); - [propput] HRESULT BackgroundPalette( [in] long BackgroundPalette ); - [propget] HRESULT BackgroundPalette( [out] long *pBackgroundPalette ); - [propput] HRESULT Visible( [in] long Visible ); - [propget] HRESULT Visible( [out] long *pVisible ); - [propput] HRESULT Left( [in] long Left ); - [propget] HRESULT Left( [out] long *pLeft ); - [propput] HRESULT Width( [in] long Width ); - [propget] HRESULT Width( [out] long *pWidth ); - [propput] HRESULT Top( [in] long Top ); - [propget] HRESULT Top( [out] long *pTop ); - [propput] HRESULT Height( [in] long Height ); - [propget] HRESULT Height( [out] long *pHeight ); + [propput] HRESULT WindowStyle( [in] LONG WindowStyle ); + [propget] HRESULT WindowStyle( [out] LONG *WindowStyle ); + [propput] HRESULT WindowStyleEx( [in] LONG WindowStyleEx ); + [propget] HRESULT WindowStyleEx( [out] LONG *WindowStyleEx ); + [propput] HRESULT AutoShow( [in] LONG AutoShow ); + [propget] HRESULT AutoShow( [out] LONG *AutoShow ); + [propput] HRESULT WindowState( [in] LONG WindowState ); + [propget] HRESULT WindowState( [out] LONG *WindowState ); + [propput] HRESULT BackgroundPalette( [in] LONG BackgroundPalette ); + [propget] HRESULT BackgroundPalette( [out] LONG *pBackgroundPalette ); + [propput] HRESULT Visible( [in] LONG Visible ); + [propget] HRESULT Visible( [out] LONG *pVisible ); + [propput] HRESULT Left( [in] LONG Left ); + [propget] HRESULT Left( [out] LONG *pLeft ); + [propput] HRESULT Width( [in] LONG Width ); + [propget] HRESULT Width( [out] LONG *pWidth ); + [propput] HRESULT Top( [in] LONG Top ); + [propget] HRESULT Top( [out] LONG *pTop ); + [propput] HRESULT Height( [in] LONG Height ); + [propget] HRESULT Height( [out] LONG *pHeight ); [propput] HRESULT Owner( [in] OAHWND Owner ); [propget] HRESULT Owner( [out] OAHWND *Owner ); [propput] HRESULT MessageDrain( [in] OAHWND Drain ); [propget] HRESULT MessageDrain( [out] OAHWND *Drain ); - [propget] HRESULT BorderColor( [out] long *Color ); - [propput] HRESULT BorderColor( [in] long Color ); - [propget] HRESULT FullScreenMode( [out] long *FullScreenMode ); - [propput] HRESULT FullScreenMode( [in] long FullScreenMode ); - HRESULT SetWindowForeground( [in] long Focus ); - HRESULT NotifyOwnerMessage( [in] OAHWND hwnd, [in] long uMsg, [in] LONG_PTR wParam, [in] LONG_PTR lParam ); - HRESULT SetWindowPosition( [in] long Left, [in] long Top, [in] long Width, [in] long Height ); - HRESULT GetWindowPosition( [out] long *pLeft, [out] long *pTop, [out] long *pWidth, [out] long *pHeight ); - HRESULT GetMinIdealImageSize( [out] long *pWidth, [out] long *pHeight ); - HRESULT GetMaxIdealImageSize( [out] long *pWidth, [out] long *pHeight ); - HRESULT GetRestorePosition( [out] long *pLeft, [out] long *pTop, [out] long *pWidth, [out] long *pHeight ); - HRESULT HideCursor( [in] long HideCursor ); - HRESULT IsCursorHidden( [out] long *CursorHidden ); + [propget] HRESULT BorderColor( [out] LONG *Color ); + [propput] HRESULT BorderColor( [in] LONG Color ); + [propget] HRESULT FullScreenMode( [out] LONG *FullScreenMode ); + [propput] HRESULT FullScreenMode( [in] LONG FullScreenMode ); + HRESULT SetWindowForeground( [in] LONG Focus ); + HRESULT NotifyOwnerMessage( [in] OAHWND hwnd, [in] LONG uMsg, [in] LONG_PTR wParam, [in] LONG_PTR lParam ); + HRESULT SetWindowPosition( [in] LONG Left, [in] LONG Top, [in] LONG Width, [in] LONG Height ); + HRESULT GetWindowPosition( [out] LONG *pLeft, [out] LONG *pTop, [out] LONG *pWidth, [out] LONG *pHeight ); + HRESULT GetMinIdealImageSize( [out] LONG *pWidth, [out] LONG *pHeight ); + HRESULT GetMaxIdealImageSize( [out] LONG *pWidth, [out] LONG *pHeight ); + HRESULT GetRestorePosition( [out] LONG *pLeft, [out] LONG *pTop, [out] LONG *pWidth, [out] LONG *pHeight ); + HRESULT HideCursor( [in] LONG HideCursor ); + HRESULT IsCursorHidden( [out] LONG *CursorHidden ); } @@ -138,39 +138,39 @@ interface IVideoWindow : IDispatch interface IBasicVideo : IDispatch { [propget] HRESULT AvgTimePerFrame( [out] REFTIME *pAvgTimePerFrame ); - [propget] HRESULT BitRate( [out] long *pBitRate ); - [propget] HRESULT BitErrorRate( [out] long *pBitErrorRate ); - [propget] HRESULT VideoWidth( [out] long *pVideoWidth ); - [propget] HRESULT VideoHeight( [out] long *pVideoHeight ); - [propput] HRESULT SourceLeft( [in] long SourceLeft ); - [propget] HRESULT SourceLeft( [out] long *pSourceLeft ); - [propput] HRESULT SourceWidth( [in] long SourceWidth ); - [propget] HRESULT SourceWidth( [out] long *pSourceWidth ); - [propput] HRESULT SourceTop( [in] long SourceTop ); - [propget] HRESULT SourceTop( [out] long *pSourceTop ); - [propput] HRESULT SourceHeight( [in] long SourceHeight ); - [propget] HRESULT SourceHeight( [out] long *pSourceHeight ); - [propput] HRESULT DestinationLeft( [in] long DestinationLeft ); - [propget] HRESULT DestinationLeft( [out] long *pDestinationLeft ); - [propput] HRESULT DestinationWidth( [in] long DestinationWidth ); - [propget] HRESULT DestinationWidth( [out] long *pDestinationWidth ); - [propput] HRESULT DestinationTop( [in] long DestinationTop ); - [propget] HRESULT DestinationTop( [out] long *pDestinationTop ); - [propput] HRESULT DestinationHeight( [in] long DestinationHeight ); - [propget] HRESULT DestinationHeight( [out] long *pDestinationHeight ); - HRESULT SetSourcePosition( [in] long Left, [in] long Top, [in] long Width, [in] long Height ); - HRESULT GetSourcePosition( [out] long *pLeft, [out] long *pTop, [out] long *pWidth, [out] long *pHeight ); + [propget] HRESULT BitRate( [out] LONG *pBitRate ); + [propget] HRESULT BitErrorRate( [out] LONG *pBitErrorRate ); + [propget] HRESULT VideoWidth( [out] LONG *pVideoWidth ); + [propget] HRESULT VideoHeight( [out] LONG *pVideoHeight ); + [propput] HRESULT SourceLeft( [in] LONG SourceLeft ); + [propget] HRESULT SourceLeft( [out] LONG *pSourceLeft ); + [propput] HRESULT SourceWidth( [in] LONG SourceWidth ); + [propget] HRESULT SourceWidth( [out] LONG *pSourceWidth ); + [propput] HRESULT SourceTop( [in] LONG SourceTop ); + [propget] HRESULT SourceTop( [out] LONG *pSourceTop ); + [propput] HRESULT SourceHeight( [in] LONG SourceHeight ); + [propget] HRESULT SourceHeight( [out] LONG *pSourceHeight ); + [propput] HRESULT DestinationLeft( [in] LONG DestinationLeft ); + [propget] HRESULT DestinationLeft( [out] LONG *pDestinationLeft ); + [propput] HRESULT DestinationWidth( [in] LONG DestinationWidth ); + [propget] HRESULT DestinationWidth( [out] LONG *pDestinationWidth ); + [propput] HRESULT DestinationTop( [in] LONG DestinationTop ); + [propget] HRESULT DestinationTop( [out] LONG *pDestinationTop ); + [propput] HRESULT DestinationHeight( [in] LONG DestinationHeight ); + [propget] HRESULT DestinationHeight( [out] LONG *pDestinationHeight ); + HRESULT SetSourcePosition( [in] LONG Left, [in] LONG Top, [in] LONG Width, [in] LONG Height ); + HRESULT GetSourcePosition( [out] LONG *pLeft, [out] LONG *pTop, [out] LONG *pWidth, [out] LONG *pHeight ); HRESULT SetDefaultSourcePosition(); - HRESULT SetDestinationPosition( [in] long Left, [in] long Top, [in] long Width, [in] long Height ); - HRESULT GetDestinationPosition( [out] long *pLeft, [out] long *pTop, [out] long *pWidth, [out] long *pHeight ); + HRESULT SetDestinationPosition( [in] LONG Left, [in] LONG Top, [in] LONG Width, [in] LONG Height ); + HRESULT GetDestinationPosition( [out] LONG *pLeft, [out] LONG *pTop, [out] LONG *pWidth, [out] LONG *pHeight ); HRESULT SetDefaultDestinationPosition(); - HRESULT GetVideoSize( [out] long *pWidth, [out] long *pHeight ); - HRESULT GetVideoPaletteEntries( [in] long StartIndex, - [in] long Entries, - [out] long *pRetrieved, - [out, size_is(Entries), length_is(*pRetrieved)] long *pPalette ); - HRESULT GetCurrentImage( [in, out] long *pBufferSize, - [out, size_is(*pBufferSize), length_is(*pBufferSize)] long *pDIBImage ); + HRESULT GetVideoSize( [out] LONG *pWidth, [out] LONG *pHeight ); + HRESULT GetVideoPaletteEntries( [in] LONG StartIndex, + [in] LONG Entries, + [out] LONG *pRetrieved, + [out, size_is(Entries), length_is(*pRetrieved)] LONG *pPalette ); + HRESULT GetCurrentImage( [in, out] LONG *pBufferSize, + [out, size_is(*pBufferSize), length_is(*pBufferSize)] LONG *pDIBImage ); HRESULT IsUsingDefaultSource(); HRESULT IsUsingDefaultDestination(); } @@ -198,11 +198,11 @@ interface IBasicVideo2 : IBasicVideo interface IMediaEvent : IDispatch { HRESULT GetEventHandle( [out] OAEVENT *hEvent ); - HRESULT GetEvent( [out] long *lEventCode, [out] LONG_PTR *lParam1, [out] LONG_PTR *lParam2, [in] long msTimeout ); - HRESULT WaitForCompletion( [in] long msTimeout, [out] long *pEvCode ); - HRESULT CancelDefaultHandling( [in] long lEvCode ); - HRESULT RestoreDefaultHandling( [in] long lEvCode ); - HRESULT FreeEventParams( [in] long lEvCode, [in] LONG_PTR lParam1, [in] LONG_PTR lParam2 ); + HRESULT GetEvent( [out] LONG *lEventCode, [out] LONG_PTR *lParam1, [out] LONG_PTR *lParam2, [in] LONG msTimeout ); + HRESULT WaitForCompletion( [in] LONG msTimeout, [out] LONG *pEvCode ); + HRESULT CancelDefaultHandling( [in] LONG lEvCode ); + HRESULT RestoreDefaultHandling( [in] LONG lEvCode ); + HRESULT FreeEventParams( [in] LONG lEvCode, [in] LONG_PTR lParam1, [in] LONG_PTR lParam2 ); } @@ -216,9 +216,9 @@ interface IMediaEvent : IDispatch ] interface IMediaEventEx : IMediaEvent { - HRESULT SetNotifyWindow( [in] OAHWND hwnd, [in] long lMsg, [in] LONG_PTR lInstanceData ); - HRESULT SetNotifyFlags( [in] long lNoNotifyFlags ); - HRESULT GetNotifyFlags( [out] long *lplNoNotifyFlags ); + HRESULT SetNotifyWindow( [in] OAHWND hwnd, [in] LONG lMsg, [in] LONG_PTR lInstanceData ); + HRESULT SetNotifyFlags( [in] LONG lNoNotifyFlags ); + HRESULT GetNotifyFlags( [out] LONG *lplNoNotifyFlags ); } -- 2.11.4.GIT