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

wined3d: Resource size should always be non-zero in resource_init(). 

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2018-03-19 00:09:07 +03:30 committed by Alexandre Julliard
parent afe4f54bb4
commit d3baf0355a
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/wined3d/resource.c
View File

@ -91,6 +91,9 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device *
return WINED3DERR_INVALIDCALL; return WINED3DERR_INVALIDCALL;
} }
if (!size)
ERR("Attempting to create a zero-sized resource.\n");
for (i = 0; i < ARRAY_SIZE(resource_types); ++i) for (i = 0; i < ARRAY_SIZE(resource_types); ++i)
{ {
if (resource_types[i].type != type if (resource_types[i].type != type
@ -188,18 +191,11 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device *
resource->resource_ops = resource_ops; resource->resource_ops = resource_ops;
resource->map_binding = WINED3D_LOCATION_SYSMEM; resource->map_binding = WINED3D_LOCATION_SYSMEM;
if (size)
{
if (!wined3d_resource_allocate_sysmem(resource)) if (!wined3d_resource_allocate_sysmem(resource))
{ {
ERR("Failed to allocate system memory.\n"); ERR("Failed to allocate system memory.\n");
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
} }
}
else
{
resource->heap_memory = NULL;
}
if (!(usage & WINED3DUSAGE_PRIVATE)) if (!(usage & WINED3DUSAGE_PRIVATE))
{ {