[PATCH] quartz: Avoid LPVOID for VMR9_ImagePresenter_QueryInterface.

Andrey Gusev andrey.goosev at gmail.com
Thu Jun 6 05:40:02 CDT 2019


Signed-off-by: Andrey Gusev <andrey.goosev at gmail.com>
---
 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 d208b1c53e..751eeeb816 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;
-- 
2.21.0




More information about the wine-devel mailing list