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
bd5cdef5
Commit
bd5cdef5
authored
Sep 01, 2022
by
Ziqing Hui
Committed by
Alexandre Julliard
Sep 02, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3d10: Handle invalid arguments for effect creation.
Passing NULL data to D3D10CreateEffectFromMemory crashes. Passing NULL data to D3D10CreateEffectPoolFromMemory returns E_INVALIDARG.
parent
6c4f9ec5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
7 deletions
+6
-7
effect.c
dlls/d3d10/effect.c
+6
-0
effect.c
dlls/d3d10/tests/effect.c
+0
-7
No files found.
dlls/d3d10/effect.c
View file @
bd5cdef5
...
...
@@ -9537,6 +9537,9 @@ static HRESULT d3d10_create_effect(void *data, SIZE_T data_size, ID3D10Device *d
struct
d3d10_effect
*
object
;
HRESULT
hr
;
if
(
!
device
)
return
D3DERR_INVALIDCALL
;
if
(
!
(
object
=
calloc
(
1
,
sizeof
(
*
object
))))
return
E_OUTOFMEMORY
;
...
...
@@ -9636,6 +9639,9 @@ HRESULT WINAPI D3D10CreateEffectPoolFromMemory(void *data, SIZE_T data_size, UIN
TRACE
(
"data %p, data_size %Iu, fx_flags %#x, device %p, effect_pool %p.
\n
"
,
data
,
data_size
,
fx_flags
,
device
,
effect_pool
);
if
(
!
data
)
return
E_INVALIDARG
;
if
(
FAILED
(
hr
=
d3d10_create_effect
(
data
,
data_size
,
device
,
NULL
,
D3D10_EFFECT_IS_POOL
,
&
object
)))
{
...
...
dlls/d3d10/tests/effect.c
View file @
bd5cdef5
...
...
@@ -118,11 +118,8 @@ static void test_effect_constant_buffer_type(void)
return
;
}
if
(
strcmp
(
winetest_platform
,
"wine"
))
/* Crash on wine. */
{
hr
=
create_effect
(
fx_test_ecbt
,
0
,
NULL
,
NULL
,
&
effect
);
ok
(
hr
==
D3DERR_INVALIDCALL
,
"Got unexpected hr %#lx.
\n
"
,
hr
);
}
hr
=
create_effect
(
fx_test_ecbt
,
0
,
device
,
NULL
,
&
effect
);
ok
(
hr
==
S_OK
,
"Got unexpected hr %#lx.
\n
"
,
hr
);
...
...
@@ -7120,14 +7117,10 @@ static void test_effect_pool(void)
ok
(
!!
device2
,
"Failed to create d3d device.
\n
"
);
hr
=
D3D10CreateEffectPoolFromMemory
(
NULL
,
0
,
0
,
device
,
&
pool
);
todo_wine
ok
(
hr
==
E_INVALIDARG
,
"Got unexpected hr %#lx.
\n
"
,
hr
);
if
(
strcmp
(
winetest_platform
,
"wine"
))
/* Crash on wine. */
{
hr
=
create_effect_pool
(
fx_test_pool
,
NULL
,
&
pool
);
ok
(
hr
==
D3DERR_INVALIDCALL
,
"Got unexpected hr %#lx.
\n
"
,
hr
);
}
hr
=
create_effect_pool
(
fx_test_pool
,
device
,
&
pool
);
ok
(
hr
==
S_OK
,
"Got unexpected hr %#lx.
\n
"
,
hr
);
...
...
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