ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qedit: Use an iface instead of a vtbl pointer in MediaDetImpl.

This commit is contained in:
Michael Stefaniuc 2010-12-08 22:59:33 +01:00 committed by Alexandre Julliard
parent 38b4a4d7d7
commit 5c2cf08674
1 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
dlls/qedit/mediadet.c
View File

@ -33,7 +33,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(qedit); WINE_DEFAULT_DEBUG_CHANNEL(qedit);
typedef struct MediaDetImpl { typedef struct MediaDetImpl {
const IMediaDetVtbl *MediaDet_Vtbl; IMediaDet IMediaDet_iface;
LONG refCount; LONG refCount;
IGraphBuilder *graph; IGraphBuilder *graph;
IBaseFilter *source; IBaseFilter *source;
@ -43,6 +43,11 @@ typedef struct MediaDetImpl {
IPin *cur_pin; IPin *cur_pin;
} MediaDetImpl; } MediaDetImpl;
static inline MediaDetImpl *impl_from_IMediaDet(IMediaDet *iface)
{
return CONTAINING_RECORD(iface, MediaDetImpl, IMediaDet_iface);
}
static void MD_cleanup(MediaDetImpl *This) static void MD_cleanup(MediaDetImpl *This)
{ {
if (This->cur_pin) IPin_Release(This->cur_pin); if (This->cur_pin) IPin_Release(This->cur_pin);
@ -59,7 +64,7 @@ static void MD_cleanup(MediaDetImpl *This)
static ULONG WINAPI MediaDet_AddRef(IMediaDet* iface) static ULONG WINAPI MediaDet_AddRef(IMediaDet* iface)
{ {
MediaDetImpl *This = (MediaDetImpl *)iface; MediaDetImpl *This = impl_from_IMediaDet(iface);
ULONG refCount = InterlockedIncrement(&This->refCount); ULONG refCount = InterlockedIncrement(&This->refCount);
TRACE("(%p)->() AddRef from %d\n", This, refCount - 1); TRACE("(%p)->() AddRef from %d\n", This, refCount - 1);
return refCount; return refCount;
@ -67,7 +72,7 @@ static ULONG WINAPI MediaDet_AddRef(IMediaDet* iface)
static ULONG WINAPI MediaDet_Release(IMediaDet* iface) static ULONG WINAPI MediaDet_Release(IMediaDet* iface)
{ {
MediaDetImpl *This = (MediaDetImpl *)iface; MediaDetImpl *This = impl_from_IMediaDet(iface);
ULONG refCount = InterlockedDecrement(&This->refCount); ULONG refCount = InterlockedDecrement(&This->refCount);
TRACE("(%p)->() Release from %d\n", This, refCount + 1); TRACE("(%p)->() Release from %d\n", This, refCount + 1);
@ -84,7 +89,7 @@ static ULONG WINAPI MediaDet_Release(IMediaDet* iface)
static HRESULT WINAPI MediaDet_QueryInterface(IMediaDet* iface, REFIID riid, static HRESULT WINAPI MediaDet_QueryInterface(IMediaDet* iface, REFIID riid,
void **ppvObject) void **ppvObject)
{ {
MediaDetImpl *This = (MediaDetImpl *)iface; MediaDetImpl *This = impl_from_IMediaDet(iface);
TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject);
if (IsEqualIID(riid, &IID_IUnknown) || if (IsEqualIID(riid, &IID_IUnknown) ||
@ -100,21 +105,21 @@ static HRESULT WINAPI MediaDet_QueryInterface(IMediaDet* iface, REFIID riid,
static HRESULT WINAPI MediaDet_get_Filter(IMediaDet* iface, IUnknown **pVal) static HRESULT WINAPI MediaDet_get_Filter(IMediaDet* iface, IUnknown **pVal)
{ {
MediaDetImpl *This = (MediaDetImpl *)iface; MediaDetImpl *This = impl_from_IMediaDet(iface);
FIXME("(%p)->(%p): not implemented!\n", This, pVal); FIXME("(%p)->(%p): not implemented!\n", This, pVal);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI MediaDet_put_Filter(IMediaDet* iface, IUnknown *newVal) static HRESULT WINAPI MediaDet_put_Filter(IMediaDet* iface, IUnknown *newVal)
{ {
MediaDetImpl *This = (MediaDetImpl *)iface; MediaDetImpl *This = impl_from_IMediaDet(iface);
FIXME("(%p)->(%p): not implemented!\n", This, newVal); FIXME("(%p)->(%p): not implemented!\n", This, newVal);
return E_NOTIMPL; 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; MediaDetImpl *This = impl_from_IMediaDet(iface);
IEnumPins *pins; IEnumPins *pins;
IPin *pin; IPin *pin;
HRESULT hr; HRESULT hr;
@ -158,7 +163,7 @@ static HRESULT WINAPI MediaDet_get_OutputStreams(IMediaDet* iface, LONG *pVal)
static HRESULT WINAPI MediaDet_get_CurrentStream(IMediaDet* iface, LONG *pVal) static HRESULT WINAPI MediaDet_get_CurrentStream(IMediaDet* iface, LONG *pVal)
{ {
MediaDetImpl *This = (MediaDetImpl *)iface; MediaDetImpl *This = impl_from_IMediaDet(iface);
TRACE("(%p)\n", This); TRACE("(%p)\n", This);
if (!pVal) if (!pVal)
@ -211,7 +216,7 @@ static HRESULT SetCurPin(MediaDetImpl *This, LONG strm)
static HRESULT WINAPI MediaDet_put_CurrentStream(IMediaDet* iface, LONG newVal) static HRESULT WINAPI MediaDet_put_CurrentStream(IMediaDet* iface, LONG newVal)
{ {
MediaDetImpl *This = (MediaDetImpl *)iface; MediaDetImpl *This = impl_from_IMediaDet(iface);
HRESULT hr; HRESULT hr;
TRACE("(%p)->(%d)\n", This, newVal); TRACE("(%p)->(%d)\n", This, newVal);
@ -237,28 +242,28 @@ static HRESULT WINAPI MediaDet_put_CurrentStream(IMediaDet* iface, LONG newVal)
static HRESULT WINAPI MediaDet_get_StreamType(IMediaDet* iface, GUID *pVal) static HRESULT WINAPI MediaDet_get_StreamType(IMediaDet* iface, GUID *pVal)
{ {
MediaDetImpl *This = (MediaDetImpl *)iface; MediaDetImpl *This = impl_from_IMediaDet(iface);
FIXME("(%p)->(%p): not implemented!\n", This, debugstr_guid(pVal)); FIXME("(%p)->(%p): not implemented!\n", This, debugstr_guid(pVal));
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI MediaDet_get_StreamTypeB(IMediaDet* iface, BSTR *pVal) static HRESULT WINAPI MediaDet_get_StreamTypeB(IMediaDet* iface, BSTR *pVal)
{ {
MediaDetImpl *This = (MediaDetImpl *)iface; MediaDetImpl *This = impl_from_IMediaDet(iface);
FIXME("(%p)->(%p): not implemented!\n", This, pVal); FIXME("(%p)->(%p): not implemented!\n", This, pVal);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI MediaDet_get_StreamLength(IMediaDet* iface, double *pVal) static HRESULT WINAPI MediaDet_get_StreamLength(IMediaDet* iface, double *pVal)
{ {
MediaDetImpl *This = (MediaDetImpl *)iface; MediaDetImpl *This = impl_from_IMediaDet(iface);
FIXME("(%p): stub!\n", This); FIXME("(%p): stub!\n", This);
return VFW_E_INVALIDMEDIATYPE; return VFW_E_INVALIDMEDIATYPE;
} }
static HRESULT WINAPI MediaDet_get_Filename(IMediaDet* iface, BSTR *pVal) static HRESULT WINAPI MediaDet_get_Filename(IMediaDet* iface, BSTR *pVal)
{ {
MediaDetImpl *This = (MediaDetImpl *)iface; MediaDetImpl *This = impl_from_IMediaDet(iface);
IFileSourceFilter *file; IFileSourceFilter *file;
LPOLESTR name; LPOLESTR name;
HRESULT hr; HRESULT hr;
@ -437,7 +442,7 @@ retry:
static HRESULT WINAPI MediaDet_put_Filename(IMediaDet* iface, BSTR newVal) static HRESULT WINAPI MediaDet_put_Filename(IMediaDet* iface, BSTR newVal)
{ {
static const WCHAR reader[] = {'R','e','a','d','e','r',0}; static const WCHAR reader[] = {'R','e','a','d','e','r',0};
MediaDetImpl *This = (MediaDetImpl *)iface; MediaDetImpl *This = impl_from_IMediaDet(iface);
IGraphBuilder *gb; IGraphBuilder *gb;
IBaseFilter *bf; IBaseFilter *bf;
HRESULT hr; HRESULT hr;
@ -476,7 +481,7 @@ static HRESULT WINAPI MediaDet_GetBitmapBits(IMediaDet* iface,
LONG *pBufferSize, char *pBuffer, LONG *pBufferSize, char *pBuffer,
LONG Width, LONG Height) LONG Width, LONG Height)
{ {
MediaDetImpl *This = (MediaDetImpl *)iface; MediaDetImpl *This = impl_from_IMediaDet(iface);
FIXME("(%p)->(%f %p %p %d %d): not implemented!\n", This, StreamTime, pBufferSize, pBuffer, FIXME("(%p)->(%f %p %p %d %d): not implemented!\n", This, StreamTime, pBufferSize, pBuffer,
Width, Height); Width, Height);
return E_NOTIMPL; return E_NOTIMPL;
@ -486,7 +491,7 @@ static HRESULT WINAPI MediaDet_WriteBitmapBits(IMediaDet* iface,
double StreamTime, LONG Width, double StreamTime, LONG Width,
LONG Height, BSTR Filename) LONG Height, BSTR Filename)
{ {
MediaDetImpl *This = (MediaDetImpl *)iface; MediaDetImpl *This = impl_from_IMediaDet(iface);
FIXME("(%p)->(%f %d %d %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; return E_NOTIMPL;
} }
@ -494,7 +499,7 @@ static HRESULT WINAPI MediaDet_WriteBitmapBits(IMediaDet* iface,
static HRESULT WINAPI MediaDet_get_StreamMediaType(IMediaDet* iface, static HRESULT WINAPI MediaDet_get_StreamMediaType(IMediaDet* iface,
AM_MEDIA_TYPE *pVal) AM_MEDIA_TYPE *pVal)
{ {
MediaDetImpl *This = (MediaDetImpl *)iface; MediaDetImpl *This = impl_from_IMediaDet(iface);
IEnumMediaTypes *types; IEnumMediaTypes *types;
AM_MEDIA_TYPE *pmt; AM_MEDIA_TYPE *pmt;
HRESULT hr; HRESULT hr;
@ -528,14 +533,14 @@ static HRESULT WINAPI MediaDet_get_StreamMediaType(IMediaDet* iface,
static HRESULT WINAPI MediaDet_GetSampleGrabber(IMediaDet* iface, static HRESULT WINAPI MediaDet_GetSampleGrabber(IMediaDet* iface,
ISampleGrabber **ppVal) ISampleGrabber **ppVal)
{ {
MediaDetImpl *This = (MediaDetImpl *)iface; MediaDetImpl *This = impl_from_IMediaDet(iface);
FIXME("(%p)->(%p): not implemented!\n", This, ppVal); FIXME("(%p)->(%p): not implemented!\n", This, ppVal);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI MediaDet_get_FrameRate(IMediaDet* iface, double *pVal) static HRESULT WINAPI MediaDet_get_FrameRate(IMediaDet* iface, double *pVal)
{ {
MediaDetImpl *This = (MediaDetImpl *)iface; MediaDetImpl *This = impl_from_IMediaDet(iface);
AM_MEDIA_TYPE mt; AM_MEDIA_TYPE mt;
VIDEOINFOHEADER *vh; VIDEOINFOHEADER *vh;
HRESULT hr; HRESULT hr;
@ -565,7 +570,7 @@ static HRESULT WINAPI MediaDet_get_FrameRate(IMediaDet* iface, double *pVal)
static HRESULT WINAPI MediaDet_EnterBitmapGrabMode(IMediaDet* iface, static HRESULT WINAPI MediaDet_EnterBitmapGrabMode(IMediaDet* iface,
double SeekTime) double SeekTime)
{ {
MediaDetImpl *This = (MediaDetImpl *)iface; MediaDetImpl *This = impl_from_IMediaDet(iface);
FIXME("(%p)->(%f): not implemented!\n", This, SeekTime); FIXME("(%p)->(%f): not implemented!\n", This, SeekTime);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -609,7 +614,7 @@ HRESULT MediaDet_create(IUnknown * pUnkOuter, LPVOID * ppv) {
ZeroMemory(obj, sizeof(MediaDetImpl)); ZeroMemory(obj, sizeof(MediaDetImpl));
obj->refCount = 1; obj->refCount = 1;
obj->MediaDet_Vtbl = &IMediaDet_VTable; obj->IMediaDet_iface.lpVtbl = &IMediaDet_VTable;
obj->graph = NULL; obj->graph = NULL;
obj->source = NULL; obj->source = NULL;
obj->splitter = NULL; obj->splitter = NULL;