Andrey Gusev : quartz: Avoid cast for VMR9_ImagePresenter_QueryInterface.
Alexandre Julliard
julliard at winehq.org
Thu Jun 6 17:05:19 CDT 2019
Module: wine
Branch: master
Commit: e87322e9d40b8a5184919a1d1010b138f018ff84
URL: https://source.winehq.org/git/wine.git/?a=commit;h=e87322e9d40b8a5184919a1d1010b138f018ff84
Author: Andrey Gusev <andrey.goosev at gmail.com>
Date: Thu Jun 6 13:40:02 2019 +0300
quartz: Avoid cast for VMR9_ImagePresenter_QueryInterface.
Signed-off-by: Andrey Gusev <andrey.goosev at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/quartz/vmr9.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c
index d208b1c..751eeeb 100644
--- a/dlls/quartz/vmr9.c
+++ b/dlls/quartz/vmr9.c
@@ -2326,16 +2326,14 @@ HRESULT VMR9Impl_create(IUnknown *outer_unk, LPVOID *ppv)
}
-static HRESULT WINAPI VMR9_ImagePresenter_QueryInterface(IVMRImagePresenter9 *iface, REFIID riid, LPVOID * ppv)
+static HRESULT WINAPI VMR9_ImagePresenter_QueryInterface(IVMRImagePresenter9 *iface, REFIID riid, void **ppv)
{
VMR9DefaultAllocatorPresenterImpl *This = impl_from_IVMRImagePresenter9(iface);
TRACE("(%p/%p)->(%s, %p)\n", This, iface, qzdebugstr_guid(riid), ppv);
*ppv = NULL;
- if (IsEqualIID(riid, &IID_IUnknown))
- *ppv = (LPVOID)&(This->IVMRImagePresenter9_iface);
- else if (IsEqualIID(riid, &IID_IVMRImagePresenter9))
+ if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IVMRImagePresenter9))
*ppv = &This->IVMRImagePresenter9_iface;
else if (IsEqualIID(riid, &IID_IVMRSurfaceAllocatorEx9))
*ppv = &This->IVMRSurfaceAllocatorEx9_iface;
More information about the wine-cvs
mailing list