From c528ef47ebb9b3ee9399928d4a53927ffca96cb0 Mon Sep 17 00:00:00 2001
From: Nikolay Sivov <nsivov@codeweavers.com>
Date: Mon, 9 Nov 2020 15:02:44 +0300
Subject: [PATCH] evr/presenter: Fix error handling on object creation.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 dlls/evr/presenter.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c
index 1b98e63a49a..335e5df2459 100644
--- a/dlls/evr/presenter.c
+++ b/dlls/evr/presenter.c
@@ -1207,13 +1207,18 @@ HRESULT evr_presenter_create(IUnknown *outer, void **out)
     InitializeCriticalSection(&object->cs);
 
     if (FAILED(hr = DXVA2CreateDirect3DDeviceManager9(&object->reset_token, &object->device_manager)))
-        IUnknown_Release(&object->IUnknown_inner);
+        goto failed;
 
     if (FAILED(hr = video_presenter_init_d3d(object)))
-        IUnknown_Release(&object->IUnknown_inner);
+        goto failed;
 
-    if (SUCCEEDED(hr))
-        *out = &object->IUnknown_inner;
+    *out = &object->IUnknown_inner;
+
+    return S_OK;
+
+failed:
+
+    IUnknown_Release(&object->IUnknown_inner);
 
     return hr;
 }
-- 
GitLab