[PATCH 1/2] d2d1: Return device context pointer for render targets.

Nikolay Sivov nsivov at codeweavers.com
Mon Sep 10 03:31:52 CDT 2018


Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---

In attempt to reduce larger patch at https://bugs.winehq.org/show_bug.cgi?id=44052.

 dlls/d2d1/dc_render_target.c   | 3 ++-
 dlls/d2d1/hwnd_render_target.c | 3 ++-
 dlls/d2d1/wic_render_target.c  | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dlls/d2d1/dc_render_target.c b/dlls/d2d1/dc_render_target.c
index d5e4f47e6d..e55483d7c1 100644
--- a/dlls/d2d1/dc_render_target.c
+++ b/dlls/d2d1/dc_render_target.c
@@ -64,7 +64,8 @@ static HRESULT STDMETHODCALLTYPE d2d_dc_render_target_QueryInterface(ID2D1DCRend
         *out = iface;
         return S_OK;
     }
-    else if (IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget))
+    else if (IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget)
+            || IsEqualGUID(iid, &IID_ID2D1DeviceContext))
         return ID2D1RenderTarget_QueryInterface(render_target->dxgi_target, iid, out);
 
     WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid));
diff --git a/dlls/d2d1/hwnd_render_target.c b/dlls/d2d1/hwnd_render_target.c
index 04d33536a6..6e91ad6a21 100644
--- a/dlls/d2d1/hwnd_render_target.c
+++ b/dlls/d2d1/hwnd_render_target.c
@@ -53,7 +53,8 @@ static HRESULT STDMETHODCALLTYPE d2d_hwnd_render_target_QueryInterface(ID2D1Hwnd
         *out = iface;
         return S_OK;
     }
-    else if (IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget))
+    else if (IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget)
+            || IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget))
         return ID2D1RenderTarget_QueryInterface(render_target->dxgi_target, iid, out);
 
     WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid));
diff --git a/dlls/d2d1/wic_render_target.c b/dlls/d2d1/wic_render_target.c
index 5642fd44ff..b742314d38 100644
--- a/dlls/d2d1/wic_render_target.c
+++ b/dlls/d2d1/wic_render_target.c
@@ -112,7 +112,8 @@ static HRESULT STDMETHODCALLTYPE d2d_wic_render_target_QueryInterface(ID2D1Rende
         *out = iface;
         return S_OK;
     }
-    else if (IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget))
+    else if (IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget)
+            || IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget))
         return ID2D1RenderTarget_QueryInterface(render_target->dxgi_target, iid, out);
 
     WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid));
-- 
2.18.0




More information about the wine-devel mailing list