Józef Kucia : dxgi: Return swapchain target output when available in dxgi_swapchain_GetContainingOutput ().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8b646aef63fda5916f4c14bef3d12be585d87b26
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8b646aef63fda5916f4c14bef3...

Author: Józef Kucia <jkucia(a)codeweavers.com>
Date:   Wed Aug  3 09:41:43 2016 +0200

dxgi: Return swapchain target output when available in dxgi_swapchain_GetContainingOutput().

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/dxgi/swapchain.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c
index 3ea7d57..869c799 100644
--- a/dlls/dxgi/swapchain.c
+++ b/dlls/dxgi/swapchain.c
@@ -344,12 +344,19 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_ResizeTarget(IDXGISwapChain *ifa
 
 static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetContainingOutput(IDXGISwapChain *iface, IDXGIOutput **output)
 {
+    struct dxgi_swapchain *swapchain = impl_from_IDXGISwapChain(iface);
     IDXGIAdapter *adapter;
     IDXGIDevice *device;
     HRESULT hr;
 
     TRACE("iface %p, output %p.\n", iface, output);
 
+    if (swapchain->target)
+    {
+        IDXGIOutput_AddRef(*output = swapchain->target);
+        return S_OK;
+    }
+
     if (FAILED(hr = dxgi_swapchain_GetDevice(iface, &IID_IDXGIDevice, (void **)&device)))
         return hr;