[PATCH v2 05/10] quartz/vmr7: Use the ddraw clipper to compute the presentation rect.

[Henri Verbeet]

From: Henri Verbeet

---
 dlls/quartz/vmr7_presenter.c | 48 ++++++++++++++++++++++++++++++++----
 1 file changed, 43 insertions(+), 5 deletions(-)

diff --git a/dlls/quartz/vmr7_presenter.c b/dlls/quartz/vmr7_presenter.c
index 29e9f31c49a..41f8d0d12a6 100644
--- a/dlls/quartz/vmr7_presenter.c
+++ b/dlls/quartz/vmr7_presenter.c
@@ -105,11 +105,47 @@ static HRESULT WINAPI image_presenter_StopPresenting(IVMRImagePresenter *iface,
     return E_NOTIMPL;
 }

+static BOOL get_clip_rect(struct vmr7_presenter *presenter, RECT *r)
+{
+    IDirectDrawClipper *clipper;
+    RGNDATA *data;
+    HRESULT hr;
+    DWORD size;
+
+    if (FAILED(hr = IDirectDrawSurface7_GetClipper(presenter->primary, &clipper)))
+        return FALSE;
+
+    if (FAILED(hr = IDirectDrawClipper_GetClipList(clipper, NULL, NULL, &size)))
+    {
+        IDirectDrawClipper_Release(clipper);
+        return FALSE;
+    }
+
+    if (!(data = malloc(size)))
+    {
+        IDirectDrawClipper_Release(clipper);
+        return FALSE;
+    }
+
+    if (FAILED(hr = IDirectDrawClipper_GetClipList(clipper, NULL, data, &size)))
+    {
+        free(data);
+        IDirectDrawClipper_Release(clipper);
+        return FALSE;
+    }
+
+    *r = data->rdh.rcBound;
+
+    free(data);
+    IDirectDrawClipper_Release(clipper);
+
+    return TRUE;
+}
+
 static HRESULT WINAPI image_presenter_PresentImage(IVMRImagePresenter *iface,
         DWORD_PTR cookie, VMRPRESENTATIONINFO *info)
 {
     struct vmr7_presenter *presenter = impl_from_IVMRImagePresenter(iface);
-    POINT point;
     HRESULT hr;
     RECT rect;

@@ -125,10 +161,12 @@ static HRESULT WINAPI image_presenter_PresentImage(IVMRImagePresenter *iface,
     if (info->dwFlags & VMRSample_SrcDstRectsValid)
         FIXME("Ignoring src/dst rects.\n");

-    GetClientRect(presenter->window, &rect);
-    point.x = point.y = 0;
-    ClientToScreen(presenter->window, &point);
-    OffsetRect(&rect, point.x, point.y);
+    if (!get_clip_rect(presenter, &rect))
+    {
+        ERR("Failed to get clip rect.\n");
+        return E_FAIL;
+    }
+
     if (FAILED(hr = IDirectDrawSurface7_Blt(presenter->primary, &rect, info->lpSurf, NULL, DDBLT_WAIT, NULL)))
         ERR("Failed to blit, hr %#lx.\n", hr);