Alistair Leslie-Hughes : d3d10core: Check parameter in ID3D10Device CreateRenderTargetView.

[Alexandre Julliard]

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

Author: Alistair Leslie-Hughes 
Date:   Mon Nov 28 06:43:35 2016 +0000

d3d10core: Check parameter in ID3D10Device CreateRenderTargetView.

Signed-off-by: Alistair Leslie-Hughes 
Signed-off-by: Henri Verbeet 
Signed-off-by: Alexandre Julliard

---

dlls/d3d10core/tests/device.c | 3 +++
 dlls/d3d11/device.c           | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c
index 260128f..18e6753 100644
--- a/dlls/d3d10core/tests/device.c
+++ b/dlls/d3d10core/tests/device.c
@@ -2219,6 +2219,9 @@ static void test_create_rendertarget_view(void)
     U(rtv_desc).Buffer.ElementOffset = 0;
     U(rtv_desc).Buffer.ElementWidth = 64;

+    hr = ID3D10Device_CreateRenderTargetView(device, NULL, &rtv_desc, &rtview);
+    ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
     expected_refcount = get_refcount((IUnknown *)device) + 1;
     hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)buffer, &rtv_desc, &rtview);
     ok(SUCCEEDED(hr), "Failed to create a rendertarget view, hr %#x.\n", hr);
diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
index 178b184..1765591 100644
--- a/dlls/d3d11/device.c
+++ b/dlls/d3d11/device.c
@@ -4590,6 +4590,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRenderTargetView(ID3D10Devic

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

+    if (!resource)
+        return E_INVALIDARG;
+
     if (FAILED(hr = ID3D10Resource_QueryInterface(resource, &IID_ID3D11Resource, (void **)&d3d11_resource)))
     {
         ERR("Resource does not implement ID3D11Resource.\n");