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
a72bffe7
Commit
a72bffe7
authored
Sep 16, 2022
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
user32/tests: Only report the first todo of a failed message sequence.
This reduces the test output to stay within the 32kB limit.
parent
5fa25d00
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
10 deletions
+18
-10
msg.c
dlls/user32/tests/msg.c
+18
-10
No files found.
dlls/user32/tests/msg.c
View file @
a72bffe7
...
...
@@ -2713,6 +2713,7 @@ static void ok_sequence_(const struct message *expected_list, const char *contex
const
struct
recvd_message
*
actual
;
int
failcount
=
0
,
dump
=
0
;
unsigned
int
count
=
0
;
BOOL
is_wine
=
!
strcmp
(
winetest_platform
,
"wine"
);
add_message
(
&
end_of_sequence
);
...
...
@@ -2729,11 +2730,12 @@ static void ok_sequence_(const struct message *expected_list, const char *contex
{
todo_wine
{
failcount
++
;
if
(
strcmp
(
winetest_platform
,
"wine"
))
dump
++
;
dump
++
;
ok_
(
file
,
line
)
(
FALSE
,
"%s: %u: in msg 0x%04x expecting wParam 0x%Ix got 0x%Ix
\n
"
,
context
,
count
,
expected
->
message
,
expected
->
wParam
,
actual
->
wParam
);
}
if
(
is_wine
)
goto
done
;
}
else
{
...
...
@@ -2750,11 +2752,12 @@ static void ok_sequence_(const struct message *expected_list, const char *contex
{
todo_wine
{
failcount
++
;
if
(
strcmp
(
winetest_platform
,
"wine"
))
dump
++
;
dump
++
;
ok_
(
file
,
line
)
(
FALSE
,
"%s: %u: in msg 0x%04x expecting lParam 0x%Ix got 0x%Ix
\n
"
,
context
,
count
,
expected
->
message
,
expected
->
lParam
,
actual
->
lParam
);
}
if
(
is_wine
)
goto
done
;
}
else
{
...
...
@@ -2776,11 +2779,12 @@ static void ok_sequence_(const struct message *expected_list, const char *contex
{
todo_wine
{
failcount
++
;
if
(
strcmp
(
winetest_platform
,
"wine"
))
dump
++
;
dump
++
;
ok_
(
file
,
line
)
(
FALSE
,
"%s: %u: the msg 0x%04x should %shave been sent by DefWindowProc
\n
"
,
context
,
count
,
expected
->
message
,
(
expected
->
flags
&
defwinproc
)
?
""
:
"NOT "
);
}
if
(
is_wine
)
goto
done
;
}
else
{
...
...
@@ -2831,23 +2835,25 @@ static void ok_sequence_(const struct message *expected_list, const char *contex
((
expected
->
flags
&
hook
)
&&
!
hCBT_hook
)
||
((
expected
->
flags
&
winevent_hook
)
&&
!
hEvent_hook
)
||
((
expected
->
flags
&
kbd_hook
)
&&
!
hKBD_hook
)
||
((
expected
->
flags
&
winevent_hook_todo
)
&&
!
strcmp
(
winetest_platform
,
"wine"
)
))
((
expected
->
flags
&
winevent_hook_todo
)
&&
is_wine
))
{
if
((
expected
->
flags
&
winevent_hook_todo
)
&&
hEvent_hook
)
{
todo_wine
{
static
int
reported
;
if
(
!
reported
++
)
todo_wine
{
ok_
(
file
,
line
)
(
FALSE
,
"%s: %u: the msg 0x%04x was expected, but got msg 0x%04x instead
\n
"
,
context
,
count
,
expected
->
message
,
actual
->
message
);
}
}
expected
++
;
goto
done
;
}
else
if
(
todo
)
{
failcount
++
;
todo_wine
{
if
(
strcmp
(
winetest_platform
,
"wine"
))
dump
++
;
dump
++
;
ok_
(
file
,
line
)
(
FALSE
,
"%s: %u: the msg 0x%04x was expected, but got msg 0x%04x instead
\n
"
,
context
,
count
,
expected
->
message
,
actual
->
message
);
}
...
...
@@ -2868,7 +2874,7 @@ static void ok_sequence_(const struct message *expected_list, const char *contex
while
(
expected
->
message
&&
((
expected
->
flags
&
optional
)
||
((
expected
->
flags
&
hook
)
&&
!
hCBT_hook
)
||
((
expected
->
flags
&
winevent_hook
)
&&
!
hEvent_hook
)
||
((
expected
->
flags
&
winevent_hook_todo
)
&&
!
strcmp
(
winetest_platform
,
"wine"
)
)))
((
expected
->
flags
&
winevent_hook_todo
)
&&
is_wine
)))
{
if
((
expected
->
flags
&
winevent_hook_todo
)
&&
hEvent_hook
)
{
...
...
@@ -2878,6 +2884,7 @@ static void ok_sequence_(const struct message *expected_list, const char *contex
}
}
expected
++
;
goto
done
;
}
if
(
todo
)
...
...
@@ -2885,11 +2892,12 @@ static void ok_sequence_(const struct message *expected_list, const char *contex
todo_wine
{
if
(
expected
->
message
||
actual
->
message
)
{
failcount
++
;
if
(
strcmp
(
winetest_platform
,
"wine"
))
dump
++
;
dump
++
;
ok_
(
file
,
line
)
(
FALSE
,
"%s: %u: the msg sequence is not complete: expected %04x - actual %04x
\n
"
,
context
,
count
,
expected
->
message
,
actual
->
message
);
}
}
if
(
is_wine
)
goto
done
;
}
else
{
...
...
@@ -2902,12 +2910,12 @@ static void ok_sequence_(const struct message *expected_list, const char *contex
}
if
(
todo
&&
!
failcount
)
/* succeeded yet marked todo */
todo_wine
{
if
(
!
strcmp
(
winetest_platform
,
"wine"
))
dump
++
;
dump
++
;
ok_
(
file
,
line
)(
TRUE
,
"%s: marked
\"
todo_wine
\"
but succeeds
\n
"
,
context
);
}
done:
if
(
dump
)
dump_sequence
(
expected_list
,
context
,
file
,
line
);
if
(
dump
&&
(
!
is_wine
||
winetest_debug
>
1
)
)
dump_sequence
(
expected_list
,
context
,
file
,
line
);
flush_sequence
();
}
...
...
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