Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
3d6ee7e5
Commit
3d6ee7e5
authored
Jun 03, 2015
by
Nikolay Sivov
Committed by
Alexandre Julliard
Jun 03, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3d8: Fix token type checks in convert_to_wined3d_declaration (Coverity).
parent
b7969dfd
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
vertexdeclaration.c
dlls/d3d8/vertexdeclaration.c
+2
-2
No files found.
dlls/d3d8/vertexdeclaration.c
View file @
3d6ee7e5
...
...
@@ -275,7 +275,7 @@ static UINT convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3
{
stream
=
((
*
token
&
D3DVSD_STREAMNUMBERMASK
)
>>
D3DVSD_STREAMNUMBERSHIFT
);
offset
=
0
;
}
else
if
(
token_type
==
D3DVSD_TOKEN_STREAMDATA
&&
!
(
token_type
&
0x10000000
))
{
}
else
if
(
token_type
==
D3DVSD_TOKEN_STREAMDATA
&&
!
(
*
token
&
D3DVSD_DATALOADTYPEMASK
))
{
DWORD
type
=
((
*
token
&
D3DVSD_DATATYPEMASK
)
>>
D3DVSD_DATATYPESHIFT
);
DWORD
reg
=
((
*
token
&
D3DVSD_VERTEXREGMASK
)
>>
D3DVSD_VERTEXREGSHIFT
);
...
...
@@ -293,7 +293,7 @@ static UINT convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3
element
->
usage_idx
=
wined3d_usage_lookup
[
reg
].
usage_idx
;
offset
+=
wined3d_type_sizes
[
type
];
}
else
if
(
token_type
==
D3DVSD_TOKEN_STREAMDATA
&&
(
token_type
&
0x10000000
))
{
}
else
if
(
token_type
==
D3DVSD_TOKEN_STREAMDATA
&&
(
*
token
&
D3DVSD_DATALOADTYPEMASK
))
{
TRACE
(
" 0x%08x SKIP(%u)
\n
"
,
token_type
,
((
token_type
&
D3DVSD_SKIPCOUNTMASK
)
>>
D3DVSD_SKIPCOUNTSHIFT
));
offset
+=
sizeof
(
DWORD
)
*
((
token_type
&
D3DVSD_SKIPCOUNTMASK
)
>>
D3DVSD_SKIPCOUNTSHIFT
);
}
...
...
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