[PATCH] d3d11: Change assert and return in unsafe_impl_from_ID3D11ShaderResourceView().

[Andrey Gusev]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46686

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com>
---
 dlls/d3d11/view.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c
index 93d0b78655..43ec357340 100644
--- a/dlls/d3d11/view.c
+++ b/dlls/d3d11/view.c
@@ -2291,8 +2291,8 @@ struct d3d_shader_resource_view *unsafe_impl_from_ID3D11ShaderResourceView(ID3D1
 {
     if (!iface)
         return NULL;
-    assert(iface->lpVtbl == &d3d11_shader_resource_view_vtbl);
-    return impl_from_ID3D11ShaderResourceView(iface);
+    assert(iface->lpVtbl == (ID3D11ShaderResourceViewVtbl *)&d3d11_shader_resource_view_vtbl);
+    return CONTAINING_RECORD(iface, struct d3d_shader_resource_view, ID3D11ShaderResourceView_iface);
 }
 
 struct d3d_shader_resource_view *unsafe_impl_from_ID3D10ShaderResourceView(ID3D10ShaderResourceView *iface)
-- 
2.20.1

[Fabian Maurer]

How does adding a cast change the logic here? I don't
see how this could fix a bug.

Also, why did you manually inline
impl_from_ID3D11ShaderResourceView?


Fabian Maurer

[Marvin]

Hi,

While running your changed tests on Windows, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=47997

Your paranoid android.


=== debian9 (32 bit report) ===

d3d11:
d3d11.c:5593: Test failed: Got unexpected hr 0x8876086a.

=== debian9 (32 bit WoW report) ===

d3d11:
d3d11.c:5593: Test failed: Got unexpected hr 0x8876086a.

=== debian9 (64 bit WoW report) ===

d3d11:
d3d11.c:5593: Test failed: Got unexpected hr 0x8876086a.
d3d11.c:16707: Test failed: Got {-1.00787401e+00, 0.00000000e+00, 1.00000000e+00, 5.03937006e-01}, expected {-1.00000000e+00, 0.00000000e+00, 1.00000000e+00, 5.03937006e-01} at (0, 0), sub-resource 0.