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

d3d10core: Fixup HRESULT in a bunch of error cases.

This commit is contained in:
Matteo Bruni 2011-09-23 17:03:20 +02:00 committed by Alexandre Julliard
parent 2a146448f4
commit d9c9b5c365
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/d3d10core/shader.c
View File

@ -57,7 +57,7 @@ static HRESULT shader_extract_from_dxbc(const void *dxbc, SIZE_T dxbc_length, st
memset(shader_info->output_signature, 0, sizeof(*shader_info->output_signature)); memset(shader_info->output_signature, 0, sizeof(*shader_info->output_signature));
hr = parse_dxbc(dxbc, dxbc_length, shdr_handler, shader_info); hr = parse_dxbc(dxbc, dxbc_length, shdr_handler, shader_info);
if (!shader_info->shader_code) hr = E_FAIL; if (!shader_info->shader_code) hr = E_INVALIDARG;
if (FAILED(hr)) if (FAILED(hr))
{ {
@ -267,6 +267,7 @@ HRESULT d3d10_vertex_shader_init(struct d3d10_vertex_shader *shader, struct d3d1
{ {
WARN("Failed to create wined3d vertex shader, hr %#x.\n", hr); WARN("Failed to create wined3d vertex shader, hr %#x.\n", hr);
shader_free_signature(&shader->output_signature); shader_free_signature(&shader->output_signature);
hr = E_INVALIDARG;
return hr; return hr;
} }
@ -411,8 +412,9 @@ HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader, struct
&shader->output_signature, shader, &d3d10_geometry_shader_wined3d_parent_ops, &shader->wined3d_shader, 4); &shader->output_signature, shader, &d3d10_geometry_shader_wined3d_parent_ops, &shader->wined3d_shader, 4);
if (FAILED(hr)) if (FAILED(hr))
{ {
WARN("Failed to create wined3d vertex shader, hr %#x.\n", hr); WARN("Failed to create wined3d geometry shader, hr %#x.\n", hr);
shader_free_signature(&shader->output_signature); shader_free_signature(&shader->output_signature);
hr = E_INVALIDARG;
return hr; return hr;
} }
@ -553,6 +555,7 @@ HRESULT d3d10_pixel_shader_init(struct d3d10_pixel_shader *shader, struct d3d10_
{ {
WARN("Failed to create wined3d pixel shader, hr %#x.\n", hr); WARN("Failed to create wined3d pixel shader, hr %#x.\n", hr);
shader_free_signature(&shader->output_signature); shader_free_signature(&shader->output_signature);
hr = E_INVALIDARG;
return hr; return hr;
} }

2
dlls/d3d10core/utils.c
View File

@ -374,7 +374,7 @@ HRESULT parse_dxbc(const char *data, SIZE_T data_size,
if (tag != TAG_DXBC) if (tag != TAG_DXBC)
{ {
WARN("Wrong tag.\n"); WARN("Wrong tag.\n");
return E_FAIL; return E_INVALIDARG;
} }
/* checksum? */ /* checksum? */