system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-20 19:34:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

wined3d: Return E_INVALIDARG from vertexdeclaration_init() on validation failure.

Browse source 
Signed-off-by: Jan Sikorski <jsikorski@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jan Sikorski 2021-02-08 18:50:38 +01:00 committed by Alexandre Julliard
parent 81dfece45c
commit 6b7f02026c
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dlls/d3d8/vertexdeclaration.c
View file

@ -358,6 +358,8 @@ HRESULT d3d8_vertex_declaration_init(struct d3d8_vertex_declaration *declaration
{
WARN("Failed to create wined3d vertex declaration, hr %#x.\n", hr);
heap_free(declaration->elements);
if (hr == E_INVALIDARG)
hr = E_FAIL;
return hr;
}
@ -379,6 +381,8 @@ HRESULT d3d8_vertex_declaration_init_fvf(struct d3d8_vertex_declaration *declara
if (FAILED(hr))
{
WARN("Failed to create wined3d vertex declaration, hr %#x.\n", hr);
if (hr == E_INVALIDARG)
hr = E_FAIL;
return hr;
}

2
dlls/d3d9/vertexdeclaration.c
View file

@ -406,6 +406,8 @@ static HRESULT vertexdeclaration_init(struct d3d9_vertex_declaration *declaratio
{
heap_free(declaration->elements);
WARN("Failed to create wined3d vertex declaration, hr %#x.\n", hr);
if (hr == E_INVALIDARG)
hr = E_FAIL;
return hr;
}

6
dlls/wined3d/vertexdeclaration.c
View file

@ -226,10 +226,10 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara
if (!(e->format->flags[WINED3D_GL_RES_TYPE_BUFFER] & WINED3DFMT_FLAG_VERTEX_ATTRIBUTE))
{
FIXME("The application tries to use an unsupported format (%s), returning E_FAIL.\n",
FIXME("The application tries to use an unsupported format (%s).\n",
debug_d3dformat(elements[i].format));
heap_free(declaration->elements);
return E_FAIL;
return E_INVALIDARG;
}
if (e->offset == WINED3D_APPEND_ALIGNED_ELEMENT)
@ -254,7 +254,7 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara
WARN("Declaration element %u with format %s and offset %u is not %u byte aligned.\n",
i, debug_d3dformat(elements[i].format), e->offset, alignment);
heap_free(declaration->elements);
return E_FAIL;
return E_INVALIDARG;
}
}