Module: wine Branch: master Commit: 7ef5f44bb5a71ae5c6dd74f8a2a8de17de97e37a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ef5f44bb5a71ae5c6dd74f8a2...
Author: Michael Stefaniuc mstefani@redhat.de Date: Thu Mar 12 01:42:38 2009 +0100
include: Change long to LONG in axextend.idl.
---
dlls/qcap/capture.h | 4 ++-- dlls/qcap/v4l.c | 20 ++++++++++---------- dlls/qcap/vfwcapture.c | 12 ++++++------ dlls/quartz/filtergraph.c | 4 ++-- include/axextend.idl | 14 +++++++------- 5 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/dlls/qcap/capture.h b/dlls/qcap/capture.h index 626bc05..42eed57 100644 --- a/dlls/qcap/capture.h +++ b/dlls/qcap/capture.h @@ -30,8 +30,8 @@ Capture *qcap_driver_init(IPin*,USHORT); HRESULT qcap_driver_destroy(Capture*); HRESULT qcap_driver_set_format(Capture*,AM_MEDIA_TYPE*); HRESULT qcap_driver_get_format(const Capture*,AM_MEDIA_TYPE**); -HRESULT qcap_driver_get_prop_range(Capture*,long,long*,long*,long*,long*,long*); -HRESULT qcap_driver_get_prop(Capture*,long,long*,long*); +HRESULT qcap_driver_get_prop_range(Capture*,LONG,LONG*,LONG*,LONG*,LONG*,LONG*); +HRESULT qcap_driver_get_prop(Capture*,LONG,LONG*,LONG*); HRESULT qcap_driver_set_prop(Capture*,long,long,long); HRESULT qcap_driver_run(Capture*,FILTER_STATE*); HRESULT qcap_driver_pause(Capture*,FILTER_STATE*); diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 7a131cd..0546797 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -324,10 +324,10 @@ HRESULT qcap_driver_get_format(const Capture *capBox, AM_MEDIA_TYPE ** mT) return S_OK; }
-HRESULT qcap_driver_get_prop_range( Capture *capBox, long Property, long *pMin, - long *pMax, long *pSteppingDelta, long *pDefault, long *pCapsFlags ) +HRESULT qcap_driver_get_prop_range( Capture *capBox, LONG Property, LONG *pMin, + LONG *pMax, LONG *pSteppingDelta, LONG *pDefault, LONG *pCapsFlags ) { - TRACE("%p -> %ld %p %p %p %p %p\n", capBox, Property, + TRACE("%p -> %d %p %p %p %p %p\n", capBox, Property, pMin, pMax, pSteppingDelta, pDefault, pCapsFlags);
switch (Property) @@ -345,7 +345,7 @@ HRESULT qcap_driver_get_prop_range( Capture *capBox, long Property, long *pMin, *pDefault = capBox->dcolour; break; default: - FIXME("Not implemented %ld\n", Property); + FIXME("Not implemented %d\n", Property); return E_NOTIMPL; } *pMin = 0; @@ -355,9 +355,9 @@ HRESULT qcap_driver_get_prop_range( Capture *capBox, long Property, long *pMin, return S_OK; }
-HRESULT qcap_driver_get_prop( Capture *capBox, long Property, long *lValue, long *Flags ) +HRESULT qcap_driver_get_prop( Capture *capBox, LONG Property, LONG *lValue, LONG *Flags ) { - TRACE("%p -> %ld %p %p\n", capBox, Property, lValue, Flags); + TRACE("%p -> %d %p %p\n", capBox, Property, lValue, Flags);
switch (Property) { @@ -374,7 +374,7 @@ HRESULT qcap_driver_get_prop( Capture *capBox, long Property, long *lValue, long *lValue = capBox->pict.colour; break; default: - FIXME("Not implemented %ld\n", Property); + FIXME("Not implemented %d\n", Property); return E_NOTIMPL; } *Flags = VideoProcAmp_Flags_Manual; @@ -932,13 +932,13 @@ HRESULT qcap_driver_get_format(const Capture *capBox, AM_MEDIA_TYPE ** mT) FAIL_WITH_ERR; }
-HRESULT qcap_driver_get_prop_range( Capture *capBox, long Property, long *pMin, - long *pMax, long *pSteppingDelta, long *pDefault, long *pCapsFlags ) +HRESULT qcap_driver_get_prop_range( Capture *capBox, LONG Property, LONG *pMin, + LONG *pMax, LONG *pSteppingDelta, LONG *pDefault, LONG *pCapsFlags ) { FAIL_WITH_ERR; }
-HRESULT qcap_driver_get_prop(Capture *capBox, long Property, long *lValue, long *Flags) +HRESULT qcap_driver_get_prop(Capture *capBox, LONG Property, LONG *lValue, LONG *Flags) { FAIL_WITH_ERR; } diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 07fba25..d851836 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -503,8 +503,8 @@ static ULONG WINAPI AMVideoProcAmp_Release(IAMVideoProcAmp * iface) }
static HRESULT WINAPI -AMVideoProcAmp_GetRange( IAMVideoProcAmp * iface, long Property, long *pMin, - long *pMax, long *pSteppingDelta, long *pDefault, long *pCapsFlags ) +AMVideoProcAmp_GetRange( IAMVideoProcAmp * iface, LONG Property, LONG *pMin, + LONG *pMax, LONG *pSteppingDelta, LONG *pDefault, LONG *pCapsFlags ) { ICOM_THIS_MULTI(VfwCapture, IAMVideoProcAmp_vtbl, iface);
@@ -513,8 +513,8 @@ AMVideoProcAmp_GetRange( IAMVideoProcAmp * iface, long Property, long *pMin, }
static HRESULT WINAPI -AMVideoProcAmp_Set( IAMVideoProcAmp * iface, long Property, long lValue, - long Flags ) +AMVideoProcAmp_Set( IAMVideoProcAmp * iface, LONG Property, LONG lValue, + LONG Flags ) { ICOM_THIS_MULTI(VfwCapture, IAMVideoProcAmp_vtbl, iface);
@@ -522,8 +522,8 @@ AMVideoProcAmp_Set( IAMVideoProcAmp * iface, long Property, long lValue, }
static HRESULT WINAPI -AMVideoProcAmp_Get( IAMVideoProcAmp * iface, long Property, long *lValue, - long *Flags ) +AMVideoProcAmp_Get( IAMVideoProcAmp * iface, LONG Property, LONG *lValue, + LONG *Flags ) { ICOM_THIS_MULTI(VfwCapture, IAMVideoProcAmp_vtbl, iface);
diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index ab0d47e..d978f72 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -5155,12 +5155,12 @@ static ULONG WINAPI MediaEventSink_Release(IMediaEventSink *iface) return Filtergraph_Release(This); }
-static HRESULT WINAPI MediaEventSink_Notify(IMediaEventSink *iface, long EventCode, LONG_PTR EventParam1, LONG_PTR EventParam2) +static HRESULT WINAPI MediaEventSink_Notify(IMediaEventSink *iface, LONG EventCode, LONG_PTR EventParam1, LONG_PTR EventParam2) { ICOM_THIS_MULTI(IFilterGraphImpl, IMediaEventSink_vtbl, iface); Event evt;
- TRACE("(%p/%p)->(%ld, %ld, %ld)\n", This, iface, EventCode, EventParam1, EventParam2); + TRACE("(%p/%p)->(%d, %ld, %ld)\n", This, iface, EventCode, EventParam1, EventParam2);
/* We need thread safety here, let's use the events queue's one */ EnterCriticalSection(&This->evqueue.msg_crst); diff --git a/include/axextend.idl b/include/axextend.idl index 723def7..bbbf179 100644 --- a/include/axextend.idl +++ b/include/axextend.idl @@ -317,7 +317,7 @@ typedef enum tagQualityMessageType typedef struct tagQuality { QualityMessageType Type; - long Proportion; + LONG Proportion; REFERENCE_TIME Late; REFERENCE_TIME TimeStamp; } Quality; @@ -486,7 +486,7 @@ pointer_default(unique) interface IMediaEventSink : IUnknown { HRESULT Notify( - [in] long EventCode, + [in] LONG EventCode, [in] LONG_PTR EventParam1, [in] LONG_PTR EventParam2 ); @@ -828,11 +828,11 @@ typedef enum tagVideoProcAmpFlags ] interface IAMVideoProcAmp : IUnknown { - HRESULT GetRange( [in] long Property, [out] long *pMin, [out] long *pMax, - [out] long *pSteppingDelta, [out] long *pDefault, - [out] long *pCapsFlags); - HRESULT Set( [in] long Property, [in] long lValue, [in] long Flags); - HRESULT Get( [in] long Property, [out] long *lValue, [out] long *Flags); + HRESULT GetRange( [in] LONG Property, [out] LONG *pMin, [out] LONG *pMax, + [out] LONG *pSteppingDelta, [out] LONG *pDefault, + [out] LONG *pCapsFlags); + HRESULT Set( [in] LONG Property, [in] LONG lValue, [in] LONG Flags); + HRESULT Get( [in] LONG Property, [out] LONG *lValue, [out] LONG *Flags); }