Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
d9c9b5c3
Commit
d9c9b5c3
authored
Sep 23, 2011
by
Matteo Bruni
Committed by
Alexandre Julliard
Sep 26, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3d10core: Fixup HRESULT in a bunch of error cases.
parent
2a146448
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
shader.c
dlls/d3d10core/shader.c
+5
-2
utils.c
dlls/d3d10core/utils.c
+1
-1
No files found.
dlls/d3d10core/shader.c
View file @
d9c9b5c3
...
...
@@ -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
));
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
))
{
...
...
@@ -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
);
shader_free_signature
(
&
shader
->
output_signature
);
hr
=
E_INVALIDARG
;
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
);
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
);
hr
=
E_INVALIDARG
;
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
);
shader_free_signature
(
&
shader
->
output_signature
);
hr
=
E_INVALIDARG
;
return
hr
;
}
...
...
dlls/d3d10core/utils.c
View file @
d9c9b5c3
...
...
@@ -374,7 +374,7 @@ HRESULT parse_dxbc(const char *data, SIZE_T data_size,
if
(
tag
!=
TAG_DXBC
)
{
WARN
(
"Wrong tag.
\n
"
);
return
E_
FAIL
;
return
E_
INVALIDARG
;
}
/* checksum? */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment