[PATCH 3/5] quartz: Get rid of the IsDefault*Rect callbacks.
Zebediah Figura
z.figura12 at gmail.com
Wed May 6 19:28:50 CDT 2020
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
dlls/quartz/quartz_private.h | 4 ----
dlls/quartz/video.c | 8 ++++----
dlls/quartz/videorenderer.c | 18 ------------------
dlls/quartz/vmr9.c | 18 ------------------
4 files changed, 4 insertions(+), 44 deletions(-)
diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h
index 2aca6000742..7f2372ce33b 100644
--- a/dlls/quartz/quartz_private.h
+++ b/dlls/quartz/quartz_private.h
@@ -175,8 +175,6 @@ typedef struct tagBaseControlVideo
typedef HRESULT (WINAPI *BaseControlVideo_GetSourceRect)(BaseControlVideo* This, RECT *pSourceRect);
typedef HRESULT (WINAPI *BaseControlVideo_GetStaticImage)(BaseControlVideo* This, LONG *pBufferSize, LONG *pDIBImage);
typedef HRESULT (WINAPI *BaseControlVideo_GetTargetRect)(BaseControlVideo* This, RECT *pTargetRect);
-typedef HRESULT (WINAPI *BaseControlVideo_IsDefaultSourceRect)(BaseControlVideo* This);
-typedef HRESULT (WINAPI *BaseControlVideo_IsDefaultTargetRect)(BaseControlVideo* This);
typedef HRESULT (WINAPI *BaseControlVideo_SetDefaultSourceRect)(BaseControlVideo* This);
typedef HRESULT (WINAPI *BaseControlVideo_SetDefaultTargetRect)(BaseControlVideo* This);
typedef HRESULT (WINAPI *BaseControlVideo_SetSourceRect)(BaseControlVideo* This, RECT *pSourceRect);
@@ -187,8 +185,6 @@ typedef struct BaseControlVideoFuncTable
BaseControlVideo_GetSourceRect pfnGetSourceRect;
BaseControlVideo_GetStaticImage pfnGetStaticImage;
BaseControlVideo_GetTargetRect pfnGetTargetRect;
- BaseControlVideo_IsDefaultSourceRect pfnIsDefaultSourceRect;
- BaseControlVideo_IsDefaultTargetRect pfnIsDefaultTargetRect;
BaseControlVideo_SetDefaultSourceRect pfnSetDefaultSourceRect;
BaseControlVideo_SetDefaultTargetRect pfnSetDefaultTargetRect;
BaseControlVideo_SetSourceRect pfnSetSourceRect;
diff --git a/dlls/quartz/video.c b/dlls/quartz/video.c
index 213e3ce92db..2d002d8de43 100644
--- a/dlls/quartz/video.c
+++ b/dlls/quartz/video.c
@@ -592,16 +592,16 @@ static HRESULT WINAPI basic_video_GetCurrentImage(IBasicVideo *iface, LONG *pBuf
static HRESULT WINAPI basic_video_IsUsingDefaultSource(IBasicVideo *iface)
{
- BaseControlVideo *This = impl_from_IBasicVideo(iface);
+ FIXME("iface %p, stub!\n", iface);
- return This->pFuncsTable->pfnIsDefaultSourceRect(This);
+ return S_OK;
}
static HRESULT WINAPI basic_video_IsUsingDefaultDestination(IBasicVideo *iface)
{
- BaseControlVideo *This = impl_from_IBasicVideo(iface);
+ FIXME("iface %p, stub!\n", iface);
- return This->pFuncsTable->pfnIsDefaultTargetRect(This);
+ return S_OK;
}
static const IBasicVideoVtbl basic_video_vtbl =
diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c
index b7a82e4faa3..39d1586c772 100644
--- a/dlls/quartz/videorenderer.c
+++ b/dlls/quartz/videorenderer.c
@@ -352,22 +352,6 @@ static HRESULT WINAPI VideoRenderer_GetTargetRect(BaseControlVideo* iface, RECT
return S_OK;
}
-static HRESULT WINAPI VideoRenderer_IsDefaultSourceRect(BaseControlVideo* iface)
-{
- struct video_renderer *This = impl_from_BaseControlVideo(iface);
- FIXME("(%p/%p)->(): stub !!!\n", This, iface);
-
- return S_OK;
-}
-
-static HRESULT WINAPI VideoRenderer_IsDefaultTargetRect(BaseControlVideo* iface)
-{
- struct video_renderer *This = impl_from_BaseControlVideo(iface);
- FIXME("(%p/%p)->(): stub !!!\n", This, iface);
-
- return S_OK;
-}
-
static HRESULT WINAPI VideoRenderer_SetDefaultSourceRect(BaseControlVideo* iface)
{
struct video_renderer *This = impl_from_BaseControlVideo(iface);
@@ -408,8 +392,6 @@ static const BaseControlVideoFuncTable renderer_BaseControlVideoFuncTable = {
VideoRenderer_GetSourceRect,
VideoRenderer_GetStaticImage,
VideoRenderer_GetTargetRect,
- VideoRenderer_IsDefaultSourceRect,
- VideoRenderer_IsDefaultTargetRect,
VideoRenderer_SetDefaultSourceRect,
VideoRenderer_SetDefaultTargetRect,
VideoRenderer_SetSourceRect,
diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c
index abca2a03d17..c0d6799eec1 100644
--- a/dlls/quartz/vmr9.c
+++ b/dlls/quartz/vmr9.c
@@ -772,22 +772,6 @@ static HRESULT WINAPI VMR9_GetTargetRect(BaseControlVideo* This, RECT *pTargetRe
return S_OK;
}
-static HRESULT WINAPI VMR9_IsDefaultSourceRect(BaseControlVideo* This)
-{
- struct quartz_vmr* pVMR9 = impl_from_BaseControlVideo(This);
- FIXME("(%p/%p)->(): stub !!!\n", pVMR9, This);
-
- return S_OK;
-}
-
-static HRESULT WINAPI VMR9_IsDefaultTargetRect(BaseControlVideo* This)
-{
- struct quartz_vmr* pVMR9 = impl_from_BaseControlVideo(This);
- FIXME("(%p/%p)->(): stub !!!\n", pVMR9, This);
-
- return S_OK;
-}
-
static HRESULT WINAPI VMR9_SetDefaultSourceRect(BaseControlVideo* This)
{
struct quartz_vmr* pVMR9 = impl_from_BaseControlVideo(This);
@@ -828,8 +812,6 @@ static const BaseControlVideoFuncTable renderer_BaseControlVideoFuncTable = {
VMR9_GetSourceRect,
VMR9_GetStaticImage,
VMR9_GetTargetRect,
- VMR9_IsDefaultSourceRect,
- VMR9_IsDefaultTargetRect,
VMR9_SetDefaultSourceRect,
VMR9_SetDefaultTargetRect,
VMR9_SetSourceRect,
--
2.26.2
More information about the wine-devel
mailing list