Zebediah Figura : quartz/vmr9: Render to the clipping window in windowless mode.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3c0b0cc8346504ce453bd5fc764b19594556a96a
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=3c0b0cc8346504ce453bd5fc7...

Author: Zebediah Figura <z.figura12(a)gmail.com>
Date:   Mon May 11 22:30:12 2020 -0500

quartz/vmr9: Render to the clipping window in windowless mode.

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/quartz/vmr9.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c
index 1236b64600..d3e75f21ed 100644
--- a/dlls/quartz/vmr9.c
+++ b/dlls/quartz/vmr9.c
@@ -1755,7 +1755,7 @@ static HRESULT WINAPI VMR9WindowlessControl_RepaintVideo(IVMRWindowlessControl9
     }
 
     /* Windowless extension */
-    hr = IDirect3DDevice9_Present(This->allocator_d3d9_dev, NULL, NULL, This->window.hwnd, NULL);
+    hr = IDirect3DDevice9_Present(This->allocator_d3d9_dev, NULL, NULL, NULL, NULL);
     LeaveCriticalSection(&This->renderer.filter.csFilter);
 
     return hr;
@@ -2451,7 +2451,7 @@ static HRESULT WINAPI VMR9_ImagePresenter_PresentImage(IVMRImagePresenter9 *ifac
     if (render && SUCCEEDED(hr))
     {
         hr = IDirect3DDevice9_Present(This->d3d9_dev, &This->pVMR9->window.src,
-                &This->pVMR9->window.dst, This->pVMR9->window.hwnd, NULL);
+                &This->pVMR9->window.dst, NULL, NULL);
         if (FAILED(hr))
             FIXME("Presenting image: %08x\n", hr);
     }
@@ -2562,17 +2562,23 @@ static BOOL CreateRenderingWindow(struct default_presenter *This, VMR9Allocation
 {
     D3DPRESENT_PARAMETERS d3dpp;
     DWORD d3d9_adapter;
+    HWND window;
     HRESULT hr;
 
     TRACE("(%p)->()\n", This);
 
+    if (This->pVMR9->mode == VMR9Mode_Windowed)
+        window = This->pVMR9->window.hwnd;
+    else
+        window = This->pVMR9->clipping_window;
+
     /* Obtain a monitor and d3d9 device */
-    d3d9_adapter = d3d9_adapter_from_hwnd(This->d3d9_ptr, This->pVMR9->window.hwnd, &This->hMon);
+    d3d9_adapter = d3d9_adapter_from_hwnd(This->d3d9_ptr, window, &This->hMon);
 
     /* Now try to create the d3d9 device */
     ZeroMemory(&d3dpp, sizeof(d3dpp));
     d3dpp.Windowed = TRUE;
-    d3dpp.hDeviceWindow = This->pVMR9->window.hwnd;
+    d3dpp.hDeviceWindow = window;
     d3dpp.SwapEffect = D3DSWAPEFFECT_COPY;
     d3dpp.BackBufferWidth = info->dwWidth;
     d3dpp.BackBufferHeight = info->dwHeight;