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
4bdd4ef4
Commit
4bdd4ef4
authored
Aug 01, 2011
by
Henri Verbeet
Committed by
Alexandre Julliard
Aug 02, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Check for locked surfaces in wined3d_surface_blt().
parent
50d883c3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
12 deletions
+6
-12
surface.c
dlls/wined3d/surface.c
+6
-12
No files found.
dlls/wined3d/surface.c
View file @
4bdd4ef4
...
...
@@ -1293,12 +1293,6 @@ static HRESULT surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_
flags
,
fx
,
debug_d3dtexturefiltertype
(
filter
));
TRACE
(
"Usage is %s.
\n
"
,
debug_d3dusage
(
dst_surface
->
resource
.
usage
));
if
((
dst_surface
->
flags
&
SFLAG_LOCKED
)
||
(
src_surface
&&
(
src_surface
->
flags
&
SFLAG_LOCKED
)))
{
WARN
(
" Surface is busy, returning DDERR_SURFACEBUSY
\n
"
);
return
WINEDDERR_SURFACEBUSY
;
}
dst_ds_flags
=
dst_surface
->
resource
.
format
->
flags
&
(
WINED3DFMT_FLAG_DEPTH
|
WINED3DFMT_FLAG_STENCIL
);
if
(
src_surface
)
src_ds_flags
=
src_surface
->
resource
.
format
->
flags
&
(
WINED3DFMT_FLAG_DEPTH
|
WINED3DFMT_FLAG_STENCIL
);
...
...
@@ -3412,6 +3406,12 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC
dst_surface
,
wine_dbgstr_rect
(
dst_rect_in
),
src_surface
,
wine_dbgstr_rect
(
src_rect_in
),
flags
,
fx
,
debug_d3dtexturefiltertype
(
filter
));
if
((
dst_surface
->
flags
&
SFLAG_LOCKED
)
||
(
src_surface
&&
(
src_surface
->
flags
&
SFLAG_LOCKED
)))
{
WARN
(
"Surface is busy, returning WINEDDERR_SURFACEBUSY.
\n
"
);
return
WINEDDERR_SURFACEBUSY
;
}
surface_get_rect
(
dst_surface
,
dst_rect_in
,
&
dst_rect
);
if
(
src_surface
)
surface_get_rect
(
src_surface
,
src_rect_in
,
&
src_rect
);
...
...
@@ -6439,12 +6439,6 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *
dst_surface
,
wine_dbgstr_rect
(
dst_rect
),
src_surface
,
wine_dbgstr_rect
(
src_rect
),
flags
,
fx
,
debug_d3dtexturefiltertype
(
filter
));
if
((
dst_surface
->
flags
&
SFLAG_LOCKED
)
||
(
src_surface
&&
(
src_surface
->
flags
&
SFLAG_LOCKED
)))
{
WARN
(
"Surface is busy, returning WINEDDERR_SURFACEBUSY
\n
"
);
return
WINEDDERR_SURFACEBUSY
;
}
/* First check for the validity of source / destination rectangles.
* This was verified using a test application and by MSDN. */
if
(
src_rect
)
...
...
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