=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: d3d11: Fix return values returned by D3D11CreateDevice functions.

Alexandre Julliard julliard at wine.codeweavers.com
Tue Apr 5 11:07:33 CDT 2016


Module: wine
Branch: master
Commit: 1b3399ce07cce26df01b0027e0169927678c764a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1b3399ce07cce26df01b0027e0169927678c764a

Author: Józef Kucia <jkucia at codeweavers.com>
Date:   Tue Apr  5 10:22:11 2016 +0200

d3d11: Fix return values returned by D3D11CreateDevice functions.

Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/d3d11/d3d11_main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c
index 3c21037..b4a00c8 100644
--- a/dlls/d3d11/d3d11_main.c
+++ b/dlls/d3d11/d3d11_main.c
@@ -295,7 +295,7 @@ HRESULT WINAPI D3D11CreateDevice(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_t
     else
         ID3D11Device_Release(device);
 
-    return S_OK;
+    return (device_out || immediate_context) ? S_OK : S_FALSE;
 }
 
 HRESULT WINAPI D3D11CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type,
@@ -367,7 +367,7 @@ HRESULT WINAPI D3D11CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D_DRIVER_T
     else
         ID3D11Device_Release(device);
 
-    return S_OK;
+    return (swapchain || device_out || immediate_context) ? S_OK : S_FALSE;
 
 cleanup:
     ID3D11Device_Release(device);




More information about the wine-cvs mailing list