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
af0bf54b
Commit
af0bf54b
authored
Feb 27, 2014
by
Francois Gouget
Committed by
Alexandre Julliard
Feb 27, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ddraw/tests: Simplify the 'NT4 testbot' special case a bit.
parent
28d3d7a0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
12 deletions
+8
-12
ddraw1.c
dlls/ddraw/tests/ddraw1.c
+4
-6
ddraw2.c
dlls/ddraw/tests/ddraw2.c
+4
-6
No files found.
dlls/ddraw/tests/ddraw1.c
View file @
af0bf54b
...
...
@@ -2316,15 +2316,14 @@ static void test_coop_level_mode_set(void)
screen_size
.
cy
=
0
;
hr
=
IDirectDraw_SetDisplayMode
(
ddraw
,
640
,
480
,
32
);
ok
(
SUCCEEDED
(
hr
)
||
broken
(
hr
==
DDERR_NOEXCLUSIVEMODE
)
/* NT4 testbot */
,
"SetDisplayMode failed, hr %#x.
\n
"
,
hr
);
if
(
hr
==
DDERR_NOEXCLUSIVEMODE
)
if
(
hr
==
DDERR_NOEXCLUSIVEMODE
/* NT4 testbot */
)
{
win_skip
(
"Broken SetDisplayMode(), skipping remaining tests.
\n
"
);
IDirectDrawSurface_Release
(
primary
);
IDirectDraw_Release
(
ddraw
);
goto
done
;
}
ok
(
SUCCEEDED
(
hr
),
"SetDisplayMode failed, hr %#x.
\n
"
,
hr
);
ok
(
!*
expect_messages
,
"Expected message %#x, but didn't receive it.
\n
"
,
*
expect_messages
);
expect_messages
=
NULL
;
...
...
@@ -2593,15 +2592,14 @@ static void test_coop_level_mode_set_multi(void)
/* With just a single ddraw object, the display mode is restored on
* release. */
hr
=
IDirectDraw_SetDisplayMode
(
ddraw1
,
800
,
600
,
32
);
ok
(
SUCCEEDED
(
hr
)
||
broken
(
hr
==
DDERR_NOEXCLUSIVEMODE
)
/* NT4 testbot */
,
"SetDisplayMode failed, hr %#x.
\n
"
,
hr
);
if
(
hr
==
DDERR_NOEXCLUSIVEMODE
)
if
(
hr
==
DDERR_NOEXCLUSIVEMODE
/* NT4 testbot */
)
{
win_skip
(
"Broken SetDisplayMode(), skipping test.
\n
"
);
IDirectDraw_Release
(
ddraw1
);
DestroyWindow
(
window
);
return
;
}
ok
(
SUCCEEDED
(
hr
),
"SetDisplayMode failed, hr %#x.
\n
"
,
hr
);
w
=
GetSystemMetrics
(
SM_CXSCREEN
);
ok
(
w
==
800
,
"Got unexpected screen width %u.
\n
"
,
w
);
h
=
GetSystemMetrics
(
SM_CYSCREEN
);
...
...
dlls/ddraw/tests/ddraw2.c
View file @
af0bf54b
...
...
@@ -2527,15 +2527,14 @@ static void test_coop_level_mode_set(void)
screen_size
.
cy
=
0
;
hr
=
IDirectDraw2_SetDisplayMode
(
ddraw
,
640
,
480
,
32
,
0
,
0
);
ok
(
SUCCEEDED
(
hr
)
||
broken
(
hr
==
DDERR_NOEXCLUSIVEMODE
)
/* NT4 testbot */
,
"SetDisplayMode failed, hr %#x.
\n
"
,
hr
);
if
(
hr
==
DDERR_NOEXCLUSIVEMODE
)
if
(
hr
==
DDERR_NOEXCLUSIVEMODE
/* NT4 testbot */
)
{
win_skip
(
"Broken SetDisplayMode(), skipping remaining tests.
\n
"
);
IDirectDrawSurface_Release
(
primary
);
IDirectDraw2_Release
(
ddraw
);
goto
done
;
}
ok
(
SUCCEEDED
(
hr
),
"SetDisplayMode failed, hr %#x.
\n
"
,
hr
);
ok
(
!*
expect_messages
,
"Expected message %#x, but didn't receive it.
\n
"
,
*
expect_messages
);
expect_messages
=
NULL
;
...
...
@@ -2893,15 +2892,14 @@ static void test_coop_level_mode_set_multi(void)
/* With just a single ddraw object, the display mode is restored on
* release. */
hr
=
IDirectDraw2_SetDisplayMode
(
ddraw1
,
800
,
600
,
32
,
0
,
0
);
ok
(
SUCCEEDED
(
hr
)
||
broken
(
hr
==
DDERR_NOEXCLUSIVEMODE
)
/* NT4 testbot */
,
"SetDisplayMode failed, hr %#x.
\n
"
,
hr
);
if
(
hr
==
DDERR_NOEXCLUSIVEMODE
)
if
(
hr
==
DDERR_NOEXCLUSIVEMODE
/* NT4 testbot */
)
{
win_skip
(
"Broken SetDisplayMode(), skipping test.
\n
"
);
IDirectDraw2_Release
(
ddraw1
);
DestroyWindow
(
window
);
return
;
}
ok
(
SUCCEEDED
(
hr
),
"SetDisplayMode failed, hr %#x.
\n
"
,
hr
);
w
=
GetSystemMetrics
(
SM_CXSCREEN
);
ok
(
w
==
800
,
"Got unexpected screen width %u.
\n
"
,
w
);
h
=
GetSystemMetrics
(
SM_CYSCREEN
);
...
...
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