Józef Kucia : wined3d: Propagate HRESULTs in context creation functions.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ad5a448d7e95d4d6c94312fb65a872591d399e6f
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=ad5a448d7e95d4d6c94312fb6...

Author: Józef Kucia <jkucia(a)codeweavers.com>
Date:   Wed May  8 12:04:06 2019 +0200

wined3d: Propagate HRESULTs in context creation functions.

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/wined3d/adapter_gl.c | 5 +++--
 dlls/wined3d/adapter_vk.c | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c
index 1f4ba79..b08ba62 100644
--- a/dlls/wined3d/adapter_gl.c
+++ b/dlls/wined3d/adapter_gl.c
@@ -4277,17 +4277,18 @@ static void adapter_gl_destroy_device(struct wined3d_device *device)
 static HRESULT adapter_gl_create_context(struct wined3d_swapchain *swapchain, struct wined3d_context **context)
 {
     struct wined3d_context_gl *context_gl;
+    HRESULT hr;
 
     TRACE("swapchain %p, context %p.\n", swapchain, context);
 
     if (!(context_gl = heap_alloc_zero(sizeof(*context_gl))))
         return E_OUTOFMEMORY;
 
-    if (FAILED(wined3d_context_gl_init(context_gl, swapchain)))
+    if (FAILED(hr = wined3d_context_gl_init(context_gl, swapchain)))
     {
         WARN("Failed to initialise context.\n");
         heap_free(context_gl);
-        return E_FAIL;
+        return hr;
     }
 
     TRACE("Created context %p.\n", context_gl);
diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c
index d39e651..fad78ae 100644
--- a/dlls/wined3d/adapter_vk.c
+++ b/dlls/wined3d/adapter_vk.c
@@ -291,17 +291,18 @@ static void adapter_vk_destroy_device(struct wined3d_device *device)
 static HRESULT adapter_vk_create_context(struct wined3d_swapchain *swapchain, struct wined3d_context **context)
 {
     struct wined3d_context *context_vk;
+    HRESULT hr;
 
     TRACE("swapchain %p, context %p.\n", swapchain, context);
 
     if (!(context_vk = heap_alloc_zero(sizeof(*context_vk))))
         return E_OUTOFMEMORY;
 
-    if (FAILED(wined3d_context_vk_init(context_vk, swapchain)))
+    if (FAILED(hr = wined3d_context_vk_init(context_vk, swapchain)))
     {
         WARN("Failed to initialise context.\n");
         heap_free(context_vk);
-        return E_FAIL;
+        return hr;
     }
 
     TRACE("Created context %p.\n", context_vk);