diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-04-13 13:19:35 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-04-24 13:30:36 +0000 |
| commit | 20e93ad5969d3dff85f0ef9e16830aee337ca075 (patch) | |
| tree | f28235f63ba8a0857f9cf1e890784a104ac3e2d4 /src/plugins/directshow/common/directshowpinenum.cpp | |
| parent | 6a2f332821ea3d8d4f6c11050d592aef0ad4df7f (diff) | |
Fix DirectShow COM class hierarchy
Remove the class DirectShowObject. Move the ref counting code
to a macro COM_REF_MIXIN that is used for the classes that are
actually instantiated.
Fix warnings:
common/directshowpin.h(56,5): warning: 'reinterpret_cast' from class 'DirectShowPin *' to its base at non-zero offset 'IUnknown *' behaves differently from 'static_cast' [-Wreinterpret-base-class]
DIRECTSHOW_OBJECT
^~~~~~~~~~~~~~~~~
common/directshowobject.h(69,33): note: expanded from macro 'DIRECTSHOW_OBJECT'
return GetInterface(reinterpret_cast<IUnknown*>(this), ppv); \
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
common/directshowpin.h(56,5): note: use 'static_cast' to adjust the pointer correctly while upcasting
Task-number: QTBUG-63512
Task-number: QTBUG-64157
Change-Id: Ibef143d675cd169b78fe46ff5a0c83f6e3434487
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src/plugins/directshow/common/directshowpinenum.cpp')
| -rw-r--r-- | src/plugins/directshow/common/directshowpinenum.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/plugins/directshow/common/directshowpinenum.cpp b/src/plugins/directshow/common/directshowpinenum.cpp index 910bba77d..e0ab58d19 100644 --- a/src/plugins/directshow/common/directshowpinenum.cpp +++ b/src/plugins/directshow/common/directshowpinenum.cpp @@ -71,13 +71,18 @@ DirectShowPinEnum::~DirectShowPinEnum() m_filter->Release(); } -HRESULT DirectShowPinEnum::getInterface(REFIID riid, void **ppvObject) +HRESULT DirectShowPinEnum::QueryInterface(REFIID riid, void **ppv) { - if (riid == IID_IEnumPins) { - return GetInterface(static_cast<IEnumPins *>(this), ppvObject); - } else { - return DirectShowObject::getInterface(riid, ppvObject); - } + if (ppv == nullptr) + return E_POINTER; + if (riid == IID_IUnknown) + *ppv = static_cast<IUnknown *>(this); + else if (riid == IID_IEnumPins) + *ppv = static_cast<IEnumPins *>(this); + else + return E_NOINTERFACE; + AddRef(); + return S_OK; } HRESULT DirectShowPinEnum::Next(ULONG cPins, IPin **ppPins, ULONG *pcFetched) |