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
eebf1181
Commit
eebf1181
authored
Dec 05, 2017
by
Henri Verbeet
Committed by
Alexandre Julliard
Dec 05, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ddraw/tests: Redundant mode sets are broken on Windows 10.
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
960017a4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
12 deletions
+20
-12
ddraw1.c
dlls/ddraw/tests/ddraw1.c
+5
-3
ddraw2.c
dlls/ddraw/tests/ddraw2.c
+5
-3
ddraw4.c
dlls/ddraw/tests/ddraw4.c
+5
-3
ddraw7.c
dlls/ddraw/tests/ddraw7.c
+5
-3
No files found.
dlls/ddraw/tests/ddraw1.c
View file @
eebf1181
...
...
@@ -2281,9 +2281,9 @@ static void test_redundant_mode_set(void)
{
DDSURFACEDESC
surface_desc
=
{
0
};
IDirectDraw
*
ddraw
;
RECT
q
,
r
,
s
;
HWND
window
;
HRESULT
hr
;
RECT
r
,
s
;
ULONG
ref
;
window
=
CreateWindowA
(
"static"
,
"ddraw_test"
,
WS_OVERLAPPEDWINDOW
,
...
...
@@ -2302,7 +2302,8 @@ static void test_redundant_mode_set(void)
U1
(
surface_desc
.
ddpfPixelFormat
).
dwRGBBitCount
);
ok
(
SUCCEEDED
(
hr
),
"SetDisplayMode failed, hr %#x.
\n
"
,
hr
);
GetWindowRect
(
window
,
&
r
);
GetWindowRect
(
window
,
&
q
);
r
=
q
;
r
.
right
/=
2
;
r
.
bottom
/=
2
;
SetWindowPos
(
window
,
HWND_TOP
,
r
.
left
,
r
.
top
,
r
.
right
,
r
.
bottom
,
0
);
...
...
@@ -2314,7 +2315,8 @@ static void test_redundant_mode_set(void)
ok
(
SUCCEEDED
(
hr
),
"SetDisplayMode failed, hr %#x.
\n
"
,
hr
);
GetWindowRect
(
window
,
&
s
);
ok
(
EqualRect
(
&
r
,
&
s
),
"Expected %s, got %s.
\n
"
,
wine_dbgstr_rect
(
&
r
),
wine_dbgstr_rect
(
&
s
));
ok
(
EqualRect
(
&
r
,
&
s
)
||
broken
(
EqualRect
(
&
q
,
&
s
)
/* Windows 10 */
),
"Expected %s, got %s.
\n
"
,
wine_dbgstr_rect
(
&
r
),
wine_dbgstr_rect
(
&
s
));
ref
=
IDirectDraw_Release
(
ddraw
);
ok
(
ref
==
0
,
"The ddraw object was not properly freed: refcount %u.
\n
"
,
ref
);
...
...
dlls/ddraw/tests/ddraw2.c
View file @
eebf1181
...
...
@@ -2414,9 +2414,9 @@ static void test_redundant_mode_set(void)
{
DDSURFACEDESC
surface_desc
=
{
0
};
IDirectDraw2
*
ddraw
;
RECT
q
,
r
,
s
;
HWND
window
;
HRESULT
hr
;
RECT
r
,
s
;
ULONG
ref
;
window
=
CreateWindowA
(
"static"
,
"ddraw_test"
,
WS_OVERLAPPEDWINDOW
,
...
...
@@ -2435,7 +2435,8 @@ static void test_redundant_mode_set(void)
U1
(
surface_desc
.
ddpfPixelFormat
).
dwRGBBitCount
,
0
,
0
);
ok
(
SUCCEEDED
(
hr
),
"SetDisplayMode failed, hr %#x.
\n
"
,
hr
);
GetWindowRect
(
window
,
&
r
);
GetWindowRect
(
window
,
&
q
);
r
=
q
;
r
.
right
/=
2
;
r
.
bottom
/=
2
;
SetWindowPos
(
window
,
HWND_TOP
,
r
.
left
,
r
.
top
,
r
.
right
,
r
.
bottom
,
0
);
...
...
@@ -2447,7 +2448,8 @@ static void test_redundant_mode_set(void)
ok
(
SUCCEEDED
(
hr
),
"SetDisplayMode failed, hr %#x.
\n
"
,
hr
);
GetWindowRect
(
window
,
&
s
);
ok
(
EqualRect
(
&
r
,
&
s
),
"Expected %s, got %s.
\n
"
,
wine_dbgstr_rect
(
&
r
),
wine_dbgstr_rect
(
&
s
));
ok
(
EqualRect
(
&
r
,
&
s
)
||
broken
(
EqualRect
(
&
q
,
&
s
)
/* Windows 10 */
),
"Expected %s, got %s.
\n
"
,
wine_dbgstr_rect
(
&
r
),
wine_dbgstr_rect
(
&
s
));
ref
=
IDirectDraw2_Release
(
ddraw
);
ok
(
ref
==
0
,
"The ddraw object was not properly freed: refcount %u.
\n
"
,
ref
);
...
...
dlls/ddraw/tests/ddraw4.c
View file @
eebf1181
...
...
@@ -2552,9 +2552,9 @@ static void test_redundant_mode_set(void)
{
DDSURFACEDESC2
surface_desc
=
{
0
};
IDirectDraw4
*
ddraw
;
RECT
q
,
r
,
s
;
HWND
window
;
HRESULT
hr
;
RECT
r
,
s
;
ULONG
ref
;
window
=
CreateWindowA
(
"static"
,
"ddraw_test"
,
WS_OVERLAPPEDWINDOW
,
...
...
@@ -2573,7 +2573,8 @@ static void test_redundant_mode_set(void)
U1
(
U4
(
surface_desc
).
ddpfPixelFormat
).
dwRGBBitCount
,
0
,
0
);
ok
(
SUCCEEDED
(
hr
),
"SetDisplayMode failed, hr %#x.
\n
"
,
hr
);
GetWindowRect
(
window
,
&
r
);
GetWindowRect
(
window
,
&
q
);
r
=
q
;
r
.
right
/=
2
;
r
.
bottom
/=
2
;
SetWindowPos
(
window
,
HWND_TOP
,
r
.
left
,
r
.
top
,
r
.
right
,
r
.
bottom
,
0
);
...
...
@@ -2585,7 +2586,8 @@ static void test_redundant_mode_set(void)
ok
(
SUCCEEDED
(
hr
),
"SetDisplayMode failed, hr %#x.
\n
"
,
hr
);
GetWindowRect
(
window
,
&
s
);
ok
(
EqualRect
(
&
r
,
&
s
),
"Expected %s, got %s.
\n
"
,
wine_dbgstr_rect
(
&
r
),
wine_dbgstr_rect
(
&
s
));
ok
(
EqualRect
(
&
r
,
&
s
)
||
broken
(
EqualRect
(
&
q
,
&
s
)
/* Windows 10 */
),
"Expected %s, got %s.
\n
"
,
wine_dbgstr_rect
(
&
r
),
wine_dbgstr_rect
(
&
s
));
ref
=
IDirectDraw4_Release
(
ddraw
);
ok
(
ref
==
0
,
"The ddraw object was not properly freed: refcount %u.
\n
"
,
ref
);
...
...
dlls/ddraw/tests/ddraw7.c
View file @
eebf1181
...
...
@@ -2279,9 +2279,9 @@ static void test_redundant_mode_set(void)
{
DDSURFACEDESC2
surface_desc
=
{
0
};
IDirectDraw7
*
ddraw
;
RECT
q
,
r
,
s
;
HWND
window
;
HRESULT
hr
;
RECT
r
,
s
;
ULONG
ref
;
window
=
CreateWindowA
(
"static"
,
"ddraw_test"
,
WS_OVERLAPPEDWINDOW
,
...
...
@@ -2299,7 +2299,8 @@ static void test_redundant_mode_set(void)
U1
(
U4
(
surface_desc
).
ddpfPixelFormat
).
dwRGBBitCount
,
0
,
0
);
ok
(
SUCCEEDED
(
hr
),
"SetDisplayMode failed, hr %#x.
\n
"
,
hr
);
GetWindowRect
(
window
,
&
r
);
GetWindowRect
(
window
,
&
q
);
r
=
q
;
r
.
right
/=
2
;
r
.
bottom
/=
2
;
SetWindowPos
(
window
,
HWND_TOP
,
r
.
left
,
r
.
top
,
r
.
right
,
r
.
bottom
,
0
);
...
...
@@ -2311,7 +2312,8 @@ static void test_redundant_mode_set(void)
ok
(
SUCCEEDED
(
hr
),
"SetDisplayMode failed, hr %#x.
\n
"
,
hr
);
GetWindowRect
(
window
,
&
s
);
ok
(
EqualRect
(
&
r
,
&
s
),
"Expected %s, got %s.
\n
"
,
wine_dbgstr_rect
(
&
r
),
wine_dbgstr_rect
(
&
s
));
ok
(
EqualRect
(
&
r
,
&
s
)
||
broken
(
EqualRect
(
&
q
,
&
s
)
/* Windows 10 */
),
"Expected %s, got %s.
\n
"
,
wine_dbgstr_rect
(
&
r
),
wine_dbgstr_rect
(
&
s
));
ref
=
IDirectDraw7_Release
(
ddraw
);
ok
(
ref
==
0
,
"The ddraw object was not properly freed: refcount %u.
\n
"
,
ref
);
...
...
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