ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3d11: Validate "MiscFlags" and "StructureByteStride" for raw and structured buffers. 

Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia 2016-07-20 15:49:40 +02:00 committed by Alexandre Julliard
parent 9cb2c6db2f
commit 888de4efd8
1 changed files with 44 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
dlls/d3d11/buffer.c
View File

@ -372,7 +372,7 @@ struct d3d_buffer *unsafe_impl_from_ID3D10Buffer(ID3D10Buffer *iface)
return CONTAINING_RECORD(iface, struct d3d_buffer, ID3D10Buffer_iface); return CONTAINING_RECORD(iface, struct d3d_buffer, ID3D10Buffer_iface);
} }
static void STDMETHODCALLTYPE d3d10_buffer_wined3d_object_released(void *parent) static void STDMETHODCALLTYPE d3d_buffer_wined3d_object_released(void *parent)
{ {
struct d3d_buffer *buffer = parent; struct d3d_buffer *buffer = parent;
@ -380,9 +380,9 @@ static void STDMETHODCALLTYPE d3d10_buffer_wined3d_object_released(void *parent)
HeapFree(GetProcessHeap(), 0, parent); HeapFree(GetProcessHeap(), 0, parent);
} }
static const struct wined3d_parent_ops d3d10_buffer_wined3d_parent_ops = static const struct wined3d_parent_ops d3d_buffer_wined3d_parent_ops =
{ {
d3d10_buffer_wined3d_object_released, d3d_buffer_wined3d_object_released,
}; };
static HRESULT d3d_buffer_init(struct d3d_buffer *buffer, struct d3d_device *device, static HRESULT d3d_buffer_init(struct d3d_buffer *buffer, struct d3d_device *device,
@ -398,18 +398,51 @@ static HRESULT d3d_buffer_init(struct d3d_buffer *buffer, struct d3d_device *dev
wined3d_private_store_init(&buffer->private_store); wined3d_private_store_init(&buffer->private_store);
buffer->desc = *desc; buffer->desc = *desc;
wined3d_desc.byte_width = desc->ByteWidth; if (buffer->desc.MiscFlags & D3D11_RESOURCE_MISC_BUFFER_ALLOW_RAW_VIEWS)
wined3d_desc.usage = wined3d_usage_from_d3d11(0, desc->Usage); {
wined3d_desc.bind_flags = desc->BindFlags; if (buffer->desc.MiscFlags & D3D11_RESOURCE_MISC_BUFFER_STRUCTURED)
wined3d_desc.cpu_access_flags = desc->CPUAccessFlags; {
wined3d_desc.misc_flags = desc->MiscFlags; WARN("Raw and structure buffers are mutually exclusive.\n");
return E_INVALIDARG;
}
if (!(buffer->desc.BindFlags & (D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_UNORDERED_ACCESS)))
{
WARN("Invalid bind flags %#x for raw buffer.\n", buffer->desc.BindFlags);
return E_INVALIDARG;
}
}
if (desc->StructureByteStride) if (buffer->desc.MiscFlags & D3D11_RESOURCE_MISC_BUFFER_STRUCTURED)
FIXME("Ignoring structure byte stride %u.\n", desc->StructureByteStride); {
if (!buffer->desc.StructureByteStride || buffer->desc.StructureByteStride % 4)
{
WARN("Invalid structure byte stride %u.\n", buffer->desc.StructureByteStride);
return E_INVALIDARG;
}
if (buffer->desc.ByteWidth % buffer->desc.StructureByteStride)
{
WARN("Byte width %u is not divisible by structure byte stride %u.\n",
buffer->desc.ByteWidth, buffer->desc.StructureByteStride);
return E_INVALIDARG;
}
}
else
{
buffer->desc.StructureByteStride = 0;
}
wined3d_desc.byte_width = buffer->desc.ByteWidth;
wined3d_desc.usage = wined3d_usage_from_d3d11(0, buffer->desc.Usage);
wined3d_desc.bind_flags = buffer->desc.BindFlags;
wined3d_desc.cpu_access_flags = buffer->desc.CPUAccessFlags;
wined3d_desc.misc_flags = buffer->desc.MiscFlags;
if (buffer->desc.StructureByteStride)
FIXME("Ignoring structure byte stride %u.\n", buffer->desc.StructureByteStride);
if (FAILED(hr = wined3d_buffer_create(device->wined3d_device, &wined3d_desc, if (FAILED(hr = wined3d_buffer_create(device->wined3d_device, &wined3d_desc,
(const struct wined3d_sub_resource_data *)data, buffer, (const struct wined3d_sub_resource_data *)data, buffer,
&d3d10_buffer_wined3d_parent_ops, &buffer->wined3d_buffer))) &d3d_buffer_wined3d_parent_ops, &buffer->wined3d_buffer)))
{ {
WARN("Failed to create wined3d buffer, hr %#x.\n", hr); WARN("Failed to create wined3d buffer, hr %#x.\n", hr);
wined3d_private_store_cleanup(&buffer->private_store); wined3d_private_store_cleanup(&buffer->private_store);