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
d6dfb791
Commit
d6dfb791
authored
Jan 11, 2012
by
Henri Verbeet
Committed by
Alexandre Julliard
Jan 12, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ddraw/tests: Fix some surface locking calls.
In ddraw7 DDLOCK_WAIT is the default behaviour, in earlier versions it's DDLOCK_DONOTWAIT.
parent
be3a9b5e
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
4 deletions
+4
-4
ddraw1.c
dlls/ddraw/tests/ddraw1.c
+1
-1
ddraw2.c
dlls/ddraw/tests/ddraw2.c
+1
-1
ddraw4.c
dlls/ddraw/tests/ddraw4.c
+1
-1
ddraw7.c
dlls/ddraw/tests/ddraw7.c
+1
-1
No files found.
dlls/ddraw/tests/ddraw1.c
View file @
d6dfb791
...
...
@@ -283,7 +283,7 @@ static void test_clipper_blt(void)
hr
=
IDirectDrawSurface_Blt
(
dst_surface
,
NULL
,
NULL
,
NULL
,
DDBLT_COLORFILL
|
DDBLT_WAIT
,
&
fx
);
ok
(
SUCCEEDED
(
hr
),
"Failed to clear destination surface, hr %#x.
\n
"
,
hr
);
hr
=
IDirectDrawSurface_Lock
(
src_surface
,
NULL
,
&
surface_desc
,
0
,
NULL
);
hr
=
IDirectDrawSurface_Lock
(
src_surface
,
NULL
,
&
surface_desc
,
DDLOCK_WAIT
,
NULL
);
ok
(
SUCCEEDED
(
hr
),
"Failed to lock source surface, hr %#x.
\n
"
,
hr
);
((
DWORD
*
)
surface_desc
.
lpSurface
)[
0
]
=
0xff0000ff
;
((
DWORD
*
)
surface_desc
.
lpSurface
)[
1
]
=
0xff00ff00
;
...
...
dlls/ddraw/tests/ddraw2.c
View file @
d6dfb791
...
...
@@ -290,7 +290,7 @@ static void test_clipper_blt(void)
hr
=
IDirectDrawSurface_Blt
(
dst_surface
,
NULL
,
NULL
,
NULL
,
DDBLT_COLORFILL
|
DDBLT_WAIT
,
&
fx
);
ok
(
SUCCEEDED
(
hr
),
"Failed to clear destination surface, hr %#x.
\n
"
,
hr
);
hr
=
IDirectDrawSurface_Lock
(
src_surface
,
NULL
,
&
surface_desc
,
0
,
NULL
);
hr
=
IDirectDrawSurface_Lock
(
src_surface
,
NULL
,
&
surface_desc
,
DDLOCK_WAIT
,
NULL
);
ok
(
SUCCEEDED
(
hr
),
"Failed to lock source surface, hr %#x.
\n
"
,
hr
);
((
DWORD
*
)
surface_desc
.
lpSurface
)[
0
]
=
0xff0000ff
;
((
DWORD
*
)
surface_desc
.
lpSurface
)[
1
]
=
0xff00ff00
;
...
...
dlls/ddraw/tests/ddraw4.c
View file @
d6dfb791
...
...
@@ -585,7 +585,7 @@ static void test_clipper_blt(void)
hr
=
IDirectDrawSurface4_Blt
(
dst_surface
,
NULL
,
NULL
,
NULL
,
DDBLT_COLORFILL
|
DDBLT_WAIT
,
&
fx
);
ok
(
SUCCEEDED
(
hr
),
"Failed to clear destination surface, hr %#x.
\n
"
,
hr
);
hr
=
IDirectDrawSurface4_Lock
(
src_surface
,
NULL
,
&
surface_desc
,
0
,
NULL
);
hr
=
IDirectDrawSurface4_Lock
(
src_surface
,
NULL
,
&
surface_desc
,
DDLOCK_WAIT
,
NULL
);
ok
(
SUCCEEDED
(
hr
),
"Failed to lock source surface, hr %#x.
\n
"
,
hr
);
((
DWORD
*
)
surface_desc
.
lpSurface
)[
0
]
=
0xff0000ff
;
((
DWORD
*
)
surface_desc
.
lpSurface
)[
1
]
=
0xff00ff00
;
...
...
dlls/ddraw/tests/ddraw7.c
View file @
d6dfb791
...
...
@@ -86,7 +86,7 @@ static D3DCOLOR get_surface_color(IDirectDrawSurface7 *surface, UINT x, UINT y)
memset
(
&
surface_desc
,
0
,
sizeof
(
surface_desc
));
surface_desc
.
dwSize
=
sizeof
(
surface_desc
);
hr
=
IDirectDrawSurface7_Lock
(
surface
,
&
rect
,
&
surface_desc
,
DDLOCK_READONLY
|
DDLOCK_WAIT
,
NULL
);
hr
=
IDirectDrawSurface7_Lock
(
surface
,
&
rect
,
&
surface_desc
,
DDLOCK_READONLY
,
NULL
);
ok
(
SUCCEEDED
(
hr
),
"Failed to lock surface, hr %#x.
\n
"
,
hr
);
if
(
FAILED
(
hr
))
return
0xdeadbeef
;
...
...
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