From ad5a448d7e95d4d6c94312fb65a872591d399e6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3zef=20Kucia?= Date: Wed, 8 May 2019 12:04:06 +0200 Subject: [PATCH] wined3d: Propagate HRESULTs in context creation functions. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Józef Kucia Signed-off-by: Henri Verbeet Signed-off-by: Alexandre Julliard --- 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 1f4ba793ed8..b08ba62ad03 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 d39e6514454..fad78ae5931 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);