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
4b26eef8
Commit
4b26eef8
authored
Jun 06, 2016
by
Michael Stefaniuc
Committed by
Alexandre Julliard
Jun 06, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
user32/tests: Use EqualRect() instead of open coding it.
Signed-off-by:
Michael Stefaniuc
<
mstefani@redhat.de
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
fe9f23a2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
17 deletions
+6
-17
menu.c
dlls/user32/tests/menu.c
+1
-3
msg.c
dlls/user32/tests/msg.c
+1
-2
win.c
dlls/user32/tests/win.c
+4
-12
No files found.
dlls/user32/tests/menu.c
View file @
4b26eef8
...
...
@@ -393,9 +393,7 @@ static void test_getmenubarinfo(void)
ok
(
ret
,
"GetMenuBarInfo failed with error %d
\n
"
,
GetLastError
());
ret
=
GetMenuItemRect
(
hwnd
,
hmenu
,
1
,
&
rci
);
ok
(
ret
,
"GetMenuItemRect failed.
\n
"
);
ok
(
mbi
.
rcBar
.
left
==
rci
.
left
&&
mbi
.
rcBar
.
top
==
rci
.
top
&&
mbi
.
rcBar
.
bottom
==
rci
.
bottom
&&
mbi
.
rcBar
.
right
==
rci
.
right
,
"rcBar: Got %d,%d-%d,%d instead of %d,%d-%d,%d
\n
"
,
ok
(
EqualRect
(
&
mbi
.
rcBar
,
&
rci
),
"rcBar: Got %d,%d-%d,%d instead of %d,%d-%d,%d
\n
"
,
mbi
.
rcBar
.
left
,
mbi
.
rcBar
.
top
,
mbi
.
rcBar
.
right
,
mbi
.
rcBar
.
bottom
,
rci
.
left
,
rci
.
top
,
rci
.
right
,
rci
.
bottom
);
ok
(
mbi
.
hMenu
==
hmenu
,
"hMenu: Got %p instead of %p
\n
"
,
mbi
.
hMenu
,
hmenu
);
...
...
dlls/user32/tests/msg.c
View file @
4b26eef8
...
...
@@ -6499,8 +6499,7 @@ static void check_update_rgn( HWND hwnd, HRGN hrgn )
}
GetRgnBox
(
update
,
&
r1
);
GetUpdateRect
(
hwnd
,
&
r2
,
FALSE
);
ok
(
r1
.
left
==
r2
.
left
&&
r1
.
top
==
r2
.
top
&&
r1
.
right
==
r2
.
right
&&
r1
.
bottom
==
r2
.
bottom
,
"Rectangles are different: %d,%d-%d,%d / %d,%d-%d,%d
\n
"
,
ok
(
EqualRect
(
&
r1
,
&
r2
),
"Rectangles are different: %d,%d-%d,%d / %d,%d-%d,%d
\n
"
,
r1
.
left
,
r1
.
top
,
r1
.
right
,
r1
.
bottom
,
r2
.
left
,
r2
.
top
,
r2
.
right
,
r2
.
bottom
);
DeleteObject
(
tmp
);
...
...
dlls/user32/tests/win.c
View file @
4b26eef8
...
...
@@ -2461,9 +2461,7 @@ static void test_SetWindowPos(HWND hwnd, HWND hwnd2)
ret
=
SetWindowPos
(
hwnd_child
,
hwnd2
,
1
,
2
,
3
,
4
,
0
);
ok
(
ret
,
"Got %d
\n
"
,
ret
);
GetWindowRect
(
hwnd_child
,
&
rc2
);
ok
(
rc1
.
left
==
rc2
.
left
&&
rc1
.
top
==
rc2
.
top
&&
rc1
.
right
==
rc2
.
right
&&
rc1
.
bottom
==
rc2
.
bottom
,
"(%d, %d, %d, %d) != (%d, %d, %d, %d)
\n
"
,
ok
(
EqualRect
(
&
rc1
,
&
rc2
),
"(%d, %d, %d, %d) != (%d, %d, %d, %d)
\n
"
,
rc1
.
left
,
rc1
.
top
,
rc1
.
right
,
rc1
.
bottom
,
rc2
.
left
,
rc2
.
top
,
rc2
.
right
,
rc2
.
bottom
);
check_active_state
(
hwnd2
,
hwnd2
,
hwnd2
);
...
...
@@ -2472,9 +2470,7 @@ static void test_SetWindowPos(HWND hwnd, HWND hwnd2)
ret
=
SetWindowPos
(
hwnd2
,
hwnd_child
,
1
,
2
,
3
,
4
,
0
);
ok
(
ret
,
"Got %d
\n
"
,
ret
);
GetWindowRect
(
hwnd2
,
&
rc2
);
ok
(
rc1
.
left
==
rc2
.
left
&&
rc1
.
top
==
rc2
.
top
&&
rc1
.
right
==
rc2
.
right
&&
rc1
.
bottom
==
rc2
.
bottom
,
"(%d, %d, %d, %d) != (%d, %d, %d, %d)
\n
"
,
ok
(
EqualRect
(
&
rc1
,
&
rc2
),
"(%d, %d, %d, %d) != (%d, %d, %d, %d)
\n
"
,
rc1
.
left
,
rc1
.
top
,
rc1
.
right
,
rc1
.
bottom
,
rc2
.
left
,
rc2
.
top
,
rc2
.
right
,
rc2
.
bottom
);
check_active_state
(
hwnd2
,
hwnd2
,
hwnd2
);
...
...
@@ -2483,9 +2479,7 @@ static void test_SetWindowPos(HWND hwnd, HWND hwnd2)
ret
=
SetWindowPos
(
hwnd_grandchild
,
hwnd_child2
,
1
,
2
,
3
,
4
,
0
);
ok
(
ret
,
"Got %d
\n
"
,
ret
);
GetWindowRect
(
hwnd_grandchild
,
&
rc2
);
ok
(
rc1
.
left
==
rc2
.
left
&&
rc1
.
top
==
rc2
.
top
&&
rc1
.
right
==
rc2
.
right
&&
rc1
.
bottom
==
rc2
.
bottom
,
"(%d, %d, %d, %d) != (%d, %d, %d, %d)
\n
"
,
ok
(
EqualRect
(
&
rc1
,
&
rc2
),
"(%d, %d, %d, %d) != (%d, %d, %d, %d)
\n
"
,
rc1
.
left
,
rc1
.
top
,
rc1
.
right
,
rc1
.
bottom
,
rc2
.
left
,
rc2
.
top
,
rc2
.
right
,
rc2
.
bottom
);
check_active_state
(
hwnd2
,
hwnd2
,
hwnd2
);
...
...
@@ -2520,9 +2514,7 @@ static void test_SetWindowPos(HWND hwnd, HWND hwnd2)
ret
=
SetWindowPos
(
hwnd_child
,
hwnd_desktop
,
0
,
0
,
0
,
0
,
0
);
ok
(
!
ret
,
"Got %d
\n
"
,
ret
);
GetWindowRect
(
hwnd_child
,
&
rc2
);
ok
(
rc1
.
top
==
rc2
.
top
&&
rc1
.
left
==
rc2
.
left
&&
rc1
.
bottom
==
rc2
.
bottom
&&
rc1
.
right
==
rc2
.
right
,
"(%d, %d, %d, %d) != (%d, %d, %d, %d)
\n
"
,
ok
(
EqualRect
(
&
rc1
,
&
rc2
),
"(%d, %d, %d, %d) != (%d, %d, %d, %d)
\n
"
,
rc1
.
top
,
rc1
.
left
,
rc1
.
bottom
,
rc1
.
right
,
rc2
.
top
,
rc2
.
left
,
rc2
.
bottom
,
rc2
.
right
);
check_active_state
(
hwnd2
,
hwnd2
,
hwnd2
);
...
...
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