[PATCH 1/7] d2d1: Do not release the "dxgi_target" interface on d2d_bitmap_render_target_init() error paths.

Henri Verbeet hverbeet at codeweavers.com
Mon Oct 8 13:25:36 CDT 2018


Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
---
 dlls/d2d1/bitmap_render_target.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dlls/d2d1/bitmap_render_target.c b/dlls/d2d1/bitmap_render_target.c
index 836fa567e70..11c37882fce 100644
--- a/dlls/d2d1/bitmap_render_target.c
+++ b/dlls/d2d1/bitmap_render_target.c
@@ -794,6 +794,10 @@ HRESULT d2d_bitmap_render_target_init(struct d2d_bitmap_render_target *render_ta
         return hr;
     }
 
+    /* Note that we should be a little careful with the "dxgi_target"
+     * reference we get here. Because the object is aggregated, releasing the
+     * interface in any error paths below would end up calling
+     * d2d_bitmap_render_target_Release(). */
     if (FAILED(hr = IUnknown_QueryInterface(render_target->dxgi_inner,
             &IID_ID2D1RenderTarget, (void **)&render_target->dxgi_target)))
     {
@@ -816,7 +820,6 @@ HRESULT d2d_bitmap_render_target_init(struct d2d_bitmap_render_target *render_ta
     if (FAILED(hr))
     {
         WARN("Failed to create target bitmap, hr %#x.\n", hr);
-        ID2D1RenderTarget_Release(render_target->dxgi_target);
         IUnknown_Release(render_target->dxgi_inner);
         return hr;
     }
-- 
2.11.0




More information about the wine-devel mailing list