[PATCH] user32: Dont reset focus if current dialog is a child.

[Alistair Leslie-Hughes]

Regression of 44f89322ba8825a8e4851aaaf7de89910701ca75

The standard File Open Dialog, creates an empty WS_EX_CONTROLPARENT
child dialog which shouldn't receive focus.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46215
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
---
 dlls/user32/dialog.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c
index 0b33a57..72e6eee 100644
--- a/dlls/user32/dialog.c
+++ b/dlls/user32/dialog.c
@@ -692,7 +692,10 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate,
                     SetFocus( focus );
                 }
                 else
-                    SetFocus( hwnd );
+                {
+                    if (!(template.style & WS_CHILD))
+                        SetFocus( hwnd );
+                }
             }
         }
 
-- 
1.9.1

[Zebediah Figura]

On 12/13/18 5:05 PM, Alistair Leslie-Hughes wrote:
> Regression of 44f89322ba8825a8e4851aaaf7de89910701ca75
>
> The standard File Open Dialog, creates an empty WS_EX_CONTROLPARENT
> child dialog which shouldn't receive focus.
>
> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46215
> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
> ---
>   dlls/user32/dialog.c | 5 ++++-
>   1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c
> index 0b33a57..72e6eee 100644
> --- a/dlls/user32/dialog.c
> +++ b/dlls/user32/dialog.c
> @@ -692,7 +692,10 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate,
>                       SetFocus( focus );
>                   }
>                   else
> -                    SetFocus( hwnd );
> +                {
> +                    if (!(template.style & WS_CHILD))
> +                        SetFocus( hwnd );
> +                }
>               }
>           }

Surely this can be tested?

[Marvin]

Hi,

While running your changed tests on Windows, 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=45679

Your paranoid android.


=== debian9 (32 bit report) ===

user32:
menu.c:2354: Test failed: test 27
menu: Timeout

=== debian9 (32 bit Chinese:China report) ===

user32:
msg.c:14491: Test failed: bad time 2ef6e4f

=== debian9 (32 bit WoW report) ===

user32:
msg.c:8713: Test failed: WaitForSingleObject failed 102
msg.c:8719: Test failed: destroy child on thread exit: 0: the msg 0x0082 was expected, but got msg 0x000f instead
msg.c:8719: Test failed: destroy child on thread exit: 1: the msg 0x000f was expected, but got msg 0x0014 instead
msg.c:8719: Test failed: destroy child on thread exit: 2: the msg sequence is not complete: expected 0014 - actual 0000