evr/presenter: Fix error handling on object creation.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

evr/presenter: Fix error handling on object creation.
c528ef47 · Nikolay Sivov · Alexandre Julliard · 409392df · c528ef47
Commit c528ef47 authored Nov 09, 2020 by Nikolay Sivov Committed by Alexandre Julliard Nov 09, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 4 deletions

presenter.c dlls/evr/presenter.c +9 -4

No files found.
--- 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;
 }