Matteo Bruni : d3dcompiler: Fix a couple of failure return values in >= 46 D3DReflect().

Alexandre Julliard julliard at winehq.org
Tue Nov 12 16:56:06 CST 2019


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

Author: Matteo Bruni <mbruni at codeweavers.com>
Date:   Tue Nov 12 19:47:27 2019 +0100

d3dcompiler: Fix a couple of failure return values in >= 46 D3DReflect().

Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/d3dcompiler_43/reflection.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c
index ac24ba0a2d..f480c72986 100644
--- a/dlls/d3dcompiler_43/reflection.c
+++ b/dlls/d3dcompiler_43/reflection.c
@@ -2005,13 +2005,21 @@ HRESULT WINAPI D3DReflect(const void *data, SIZE_T data_size, REFIID riid, void
     if (temp[6] != data_size)
     {
         WARN("Wrong size supplied.\n");
+#if D3D_COMPILER_VERSION >= 46
+        return D3DERR_INVALIDCALL;
+#else
         return E_FAIL;
+#endif
     }
 
     if (!IsEqualGUID(riid, &IID_ID3D11ShaderReflection))
     {
         WARN("Wrong riid %s, accept only %s!\n", debugstr_guid(riid), debugstr_guid(&IID_ID3D11ShaderReflection));
+#if D3D_COMPILER_VERSION >= 46
+        return E_INVALIDARG;
+#else
         return E_NOINTERFACE;
+#endif
     }
 
     object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object));




More information about the wine-cvs mailing list