From 73b9846c4f6e4880845b04a88d9ba514f2a5a236 Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Wed, 2 Oct 2019 00:33:06 +0200 Subject: [PATCH] [dxgi] Fix some IDXGIAdapter return codes Fixes various wine test failures. --- src/dxgi/dxgi_adapter.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/dxgi/dxgi_adapter.cpp b/src/dxgi/dxgi_adapter.cpp index c8dbb73ab..accef2ce5 100644 --- a/src/dxgi/dxgi_adapter.cpp +++ b/src/dxgi/dxgi_adapter.cpp @@ -133,7 +133,7 @@ namespace dxvk { InitReturnPtr(ppOutput); if (ppOutput == nullptr) - return DXGI_ERROR_INVALID_CALL; + return E_INVALIDARG; if (Output > 0) { *ppOutput = nullptr; @@ -149,7 +149,7 @@ namespace dxvk { HRESULT STDMETHODCALLTYPE DxgiAdapter::GetDesc(DXGI_ADAPTER_DESC* pDesc) { if (pDesc == nullptr) - return DXGI_ERROR_INVALID_CALL; + return E_INVALIDARG; DXGI_ADAPTER_DESC2 desc; HRESULT hr = GetDesc2(&desc); @@ -173,7 +173,7 @@ namespace dxvk { HRESULT STDMETHODCALLTYPE DxgiAdapter::GetDesc1(DXGI_ADAPTER_DESC1* pDesc) { if (pDesc == nullptr) - return DXGI_ERROR_INVALID_CALL; + return E_INVALIDARG; DXGI_ADAPTER_DESC2 desc; HRESULT hr = GetDesc2(&desc); @@ -198,7 +198,7 @@ namespace dxvk { HRESULT STDMETHODCALLTYPE DxgiAdapter::GetDesc2(DXGI_ADAPTER_DESC2* pDesc) { if (pDesc == nullptr) - return DXGI_ERROR_INVALID_CALL; + return E_INVALIDARG; const DxgiOptions* options = m_factory->GetOptions();