Zebediah Figura : quartz/vmr9: Use TRACE for some implemented methods.
Alexandre Julliard
julliard at winehq.org
Wed May 27 15:19:31 CDT 2020
Module: wine
Branch: master
Commit: f020fe051b02d7bda90a1fdb028a60e2ab7400f0
URL: https://source.winehq.org/git/wine.git/?a=commit;h=f020fe051b02d7bda90a1fdb028a60e2ab7400f0
Author: Zebediah Figura <zfigura at codeweavers.com>
Date: Wed May 27 11:47:33 2020 -0500
quartz/vmr9: Use TRACE for some implemented methods.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/quartz/vmr9.c | 59 +++++++++++++++++++++++++++++-------------------------
1 file changed, 32 insertions(+), 27 deletions(-)
diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c
index a716a6e712..7fca3550d1 100644
--- a/dlls/quartz/vmr9.c
+++ b/dlls/quartz/vmr9.c
@@ -1699,17 +1699,18 @@ static HRESULT WINAPI VMR9WindowlessControl_SetVideoPosition(IVMRWindowlessContr
return S_OK;
}
-static HRESULT WINAPI VMR9WindowlessControl_GetVideoPosition(IVMRWindowlessControl9 *iface, RECT *source, RECT *dest)
+static HRESULT WINAPI VMR9WindowlessControl_GetVideoPosition(IVMRWindowlessControl9 *iface, RECT *src, RECT *dst)
{
- struct quartz_vmr *This = impl_from_IVMRWindowlessControl9(iface);
+ struct quartz_vmr *filter = impl_from_IVMRWindowlessControl9(iface);
- if (source)
- *source = This->window.src;
+ TRACE("filter %p, src %p, dst %p.\n", filter, src, dst);
- if (dest)
- *dest = This->window.dst;
+ if (src)
+ *src = filter->window.src;
+
+ if (dst)
+ *dst = filter->window.dst;
- FIXME("(%p/%p)->(%p/%p) stub\n", iface, This, source, dest);
return S_OK;
}
@@ -1955,42 +1956,46 @@ static ULONG WINAPI VMR9SurfaceAllocatorNotify_Release(IVMRSurfaceAllocatorNotif
return refcount;
}
-static HRESULT WINAPI VMR9SurfaceAllocatorNotify_AdviseSurfaceAllocator(IVMRSurfaceAllocatorNotify9 *iface, DWORD_PTR id, IVMRSurfaceAllocator9 *alloc)
+static HRESULT WINAPI VMR9SurfaceAllocatorNotify_AdviseSurfaceAllocator(
+ IVMRSurfaceAllocatorNotify9 *iface, DWORD_PTR cookie, IVMRSurfaceAllocator9 *allocator)
{
- struct quartz_vmr *This = impl_from_IVMRSurfaceAllocatorNotify9(iface);
+ struct quartz_vmr *filter = impl_from_IVMRSurfaceAllocatorNotify9(iface);
- /* FIXME: This code is not tested!!! */
- FIXME("(%p/%p)->(...) stub\n", iface, This);
- This->cookie = id;
+ TRACE("filter %p, cookie %#Ix, allocator %p.\n", filter, cookie, allocator);
- if (This->presenter)
+ filter->cookie = cookie;
+
+ if (filter->presenter)
return VFW_E_WRONG_STATE;
- if (FAILED(IVMRSurfaceAllocator9_QueryInterface(alloc, &IID_IVMRImagePresenter9, (void **)&This->presenter)))
+ if (FAILED(IVMRSurfaceAllocator9_QueryInterface(allocator, &IID_IVMRImagePresenter9, (void **)&filter->presenter)))
return E_NOINTERFACE;
- if (SUCCEEDED(IVMRSurfaceAllocator9_QueryInterface(alloc, &IID_IVMRSurfaceAllocatorEx9, (void **)&This->allocator)))
- This->allocator_is_ex = 1;
+ if (SUCCEEDED(IVMRSurfaceAllocator9_QueryInterface(allocator,
+ &IID_IVMRSurfaceAllocatorEx9, (void **)&filter->allocator)))
+ filter->allocator_is_ex = 1;
else
{
- This->allocator = (IVMRSurfaceAllocatorEx9 *)alloc;
- IVMRSurfaceAllocator9_AddRef(alloc);
- This->allocator_is_ex = 0;
+ filter->allocator = (IVMRSurfaceAllocatorEx9 *)allocator;
+ IVMRSurfaceAllocator9_AddRef(allocator);
+ filter->allocator_is_ex = 0;
}
return S_OK;
}
-static HRESULT WINAPI VMR9SurfaceAllocatorNotify_SetD3DDevice(IVMRSurfaceAllocatorNotify9 *iface, IDirect3DDevice9 *device, HMONITOR monitor)
+static HRESULT WINAPI VMR9SurfaceAllocatorNotify_SetD3DDevice(IVMRSurfaceAllocatorNotify9 *iface,
+ IDirect3DDevice9 *device, HMONITOR monitor)
{
- struct quartz_vmr *This = impl_from_IVMRSurfaceAllocatorNotify9(iface);
+ struct quartz_vmr *filter = impl_from_IVMRSurfaceAllocatorNotify9(iface);
- FIXME("(%p/%p)->(...) semi-stub\n", iface, This);
- if (This->allocator_d3d9_dev)
- IDirect3DDevice9_Release(This->allocator_d3d9_dev);
- This->allocator_d3d9_dev = device;
- IDirect3DDevice9_AddRef(This->allocator_d3d9_dev);
- This->allocator_mon = monitor;
+ TRACE("filter %p, device %p, monitor %p.\n", filter, device, monitor);
+
+ if (filter->allocator_d3d9_dev)
+ IDirect3DDevice9_Release(filter->allocator_d3d9_dev);
+ filter->allocator_d3d9_dev = device;
+ IDirect3DDevice9_AddRef(device);
+ filter->allocator_mon = monitor;
return S_OK;
}
More information about the wine-cvs
mailing list