[PATCH] user32/tests: Remove 1 todo_wine in msg.
Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- debian10 and debiant results, with TRUE still: https://testbot.winehq.org/JobDetails.pl?Key=67492 --- dlls/user32/tests/msg.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 303a026..b25d46c 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -2396,9 +2396,8 @@ static void dump_sequence(const struct message *expected, const char *context, c } } -#define ok_sequence( exp, contx, todo) \ - ok_sequence_( (exp), (contx), (todo), __FILE__, __LINE__) - +#define ok_sequence(exp, contx, todo) \ + ok_sequence_(exp, contx, todo, __FILE__, __LINE__) static void ok_sequence_(const struct message *expected_list, const char *context, BOOL todo, const char *file, int line) @@ -2571,10 +2570,11 @@ static void ok_sequence_(const struct message *expected_list, const char *contex context, count, expected->message, actual->message); } } + if( todo && !failcount) /* succeeded yet marked todo */ todo_wine { if (!strcmp(winetest_platform, "wine")) dump++; - ok_( file, line)( TRUE, "%s: marked \"todo_wine\" but succeeds\n", context); + ok_(file, line)(TRUE, "%s, (line %d)\n", context, __LINE__); } done: @@ -5153,7 +5153,7 @@ static void test_messages(void) ShowWindow(hwnd, SW_MINIMIZE); flush_events(); - ok_sequence(WmShowMinOverlappedSeq, "ShowWindow(SW_SHOWMINIMIZED):overlapped", TRUE); + ok_sequence(WmShowMinOverlappedSeq, "ShowWindow(SW_SHOWMINIMIZED):overlapped", FALSE); flush_sequence(); if (GetWindowLongW( hwnd, GWL_STYLE ) & WS_MINIMIZE) -- 2.10.0.windows.1
See https://www.winehq.org/pipermail/wine-devel/2019-May/146432.html On 3/19/20 9:59 AM, Serge Gautherie wrote:
Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- debian10 and debiant results, with TRUE still: https://testbot.winehq.org/JobDetails.pl?Key=67492 --- dlls/user32/tests/msg.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 303a026..b25d46c 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -2396,9 +2396,8 @@ static void dump_sequence(const struct message *expected, const char *context, c } }
-#define ok_sequence( exp, contx, todo) \ - ok_sequence_( (exp), (contx), (todo), __FILE__, __LINE__) - +#define ok_sequence(exp, contx, todo) \ + ok_sequence_(exp, contx, todo, __FILE__, __LINE__)
static void ok_sequence_(const struct message *expected_list, const char *context, BOOL todo, const char *file, int line) @@ -2571,10 +2570,11 @@ static void ok_sequence_(const struct message *expected_list, const char *contex context, count, expected->message, actual->message); } } + if( todo && !failcount) /* succeeded yet marked todo */ todo_wine { if (!strcmp(winetest_platform, "wine")) dump++; - ok_( file, line)( TRUE, "%s: marked \"todo_wine\" but succeeds\n", context); + ok_(file, line)(TRUE, "%s, (line %d)\n", context, __LINE__); }
done: @@ -5153,7 +5153,7 @@ static void test_messages(void)
ShowWindow(hwnd, SW_MINIMIZE); flush_events(); - ok_sequence(WmShowMinOverlappedSeq, "ShowWindow(SW_SHOWMINIMIZED):overlapped", TRUE); + ok_sequence(WmShowMinOverlappedSeq, "ShowWindow(SW_SHOWMINIMIZED):overlapped", FALSE); flush_sequence();
if (GetWindowLongW( hwnd, GWL_STYLE ) & WS_MINIMIZE)
On 19/03/2020 03:16, Zhiyi Zhang wrote:
See https://www.winehq.org/pipermail/wine-devel/2019-May/146432.html
Thanks for the link. --
On 3/18/20 8:59 PM, Serge Gautherie wrote:
Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- debian10 and debiant results, with TRUE still: https://testbot.winehq.org/JobDetails.pl?Key=67492 ---
It succeeds on fvwm in focus-follows-mouse mode, which is what Alexandre uses. The problem is that we incorrectly send WM_CANCELMODE when deactivating a window, and it works with fvwm in focus-follows-mouse mode because there aren't any focus changes. There's been several attempts to fix this, but they keep falling off the list.
dlls/user32/tests/msg.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 303a026..b25d46c 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -2396,9 +2396,8 @@ static void dump_sequence(const struct message *expected, const char *context, c } }
-#define ok_sequence( exp, contx, todo) \ - ok_sequence_( (exp), (contx), (todo), __FILE__, __LINE__) - +#define ok_sequence(exp, contx, todo) \ + ok_sequence_(exp, contx, todo, __FILE__, __LINE__)
static void ok_sequence_(const struct message *expected_list, const char *context, BOOL todo, const char *file, int line) @@ -2571,10 +2570,11 @@ static void ok_sequence_(const struct message *expected_list, const char *contex context, count, expected->message, actual->message); } } + if( todo && !failcount) /* succeeded yet marked todo */ todo_wine { if (!strcmp(winetest_platform, "wine")) dump++; - ok_( file, line)( TRUE, "%s: marked \"todo_wine\" but succeeds\n", context); + ok_(file, line)(TRUE, "%s, (line %d)\n", context, __LINE__); }
done: @@ -5153,7 +5153,7 @@ static void test_messages(void)
ShowWindow(hwnd, SW_MINIMIZE); flush_events(); - ok_sequence(WmShowMinOverlappedSeq, "ShowWindow(SW_SHOWMINIMIZED):overlapped", TRUE); + ok_sequence(WmShowMinOverlappedSeq, "ShowWindow(SW_SHOWMINIMIZED):overlapped", FALSE); flush_sequence();
if (GetWindowLongW( hwnd, GWL_STYLE ) & WS_MINIMIZE)
On 19/03/2020 03:35, Zebediah Figura wrote:
On 3/18/20 8:59 PM, Serge Gautherie wrote:
Signed-off-by: Serge Gautherie<winehq-git_serge_180711(a)gautherie.fr> --- debian10 and debiant results, with TRUE still: https://testbot.winehq.org/JobDetails.pl?Key=67492 ---
It succeeds on fvwm in focus-follows-mouse mode, which is what Alexandre uses. The problem is that we incorrectly send WM_CANCELMODE when deactivating a window, and it works with fvwm in focus-follows-mouse mode because there aren't any focus changes. There's been several attempts to fix this, but they keep falling off the list.
Thanks for the explanation. I am not going to work on the root cause, though. --
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=67493 Your paranoid android. === w1064v1809_ja (32 bit report) === user32: msg.c:16290: Test failed: 7: WaitForSingleObject failed
participants (4)
-
Marvin -
Serge Gautherie -
Zebediah Figura -
Zhiyi Zhang