d3d11: Check parameter in ID3D11Device CreateShaderResourceView.

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com> Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

d3d11: Check parameter in ID3D11Device CreateShaderResourceView.
576395c7 · Alistair Leslie-Hughes · Alexandre Julliard · b70821a7 · 576395c7 · 576395c7
Commit 576395c7 authored Nov 28, 2016 by Alistair Leslie-Hughes Committed by Alexandre Julliard Nov 29, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

device.c dlls/d3d11/device.c +3 -0

d3d11.c dlls/d3d11/tests/d3d11.c +3 -0

No files found.
--- a/dlls/d3d11/device.c
+++ b/dlls/d3d11/device.c
@@ -2186,6 +2186,9 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateShaderResourceView(ID3D11Dev

    TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view);

+    if (!resource)
+        return E_INVALIDARG;
+
    if (FAILED(hr = d3d_shader_resource_view_create(device, resource, desc, &object)))
        return hr;


--- a/dlls/d3d11/tests/d3d11.c
+++ b/dlls/d3d11/tests/d3d11.c
@@ -3283,6 +3283,9 @@ static void test_create_shader_resource_view(void)
    U(srv_desc).Buffer.ElementOffset = 0;
    U(srv_desc).Buffer.ElementWidth = 64;

+    hr = ID3D11Device_CreateShaderResourceView(device, NULL, &srv_desc, &srview);
+    ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
    expected_refcount = get_refcount((IUnknown *)device) + 1;
    hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)buffer, &srv_desc, &srview);
    ok(SUCCEEDED(hr), "Failed to create a shader resource view, hr %#x.\n", hr);