[PATCH 2/2] user32: If there is no dialog controls to set focus to then set focus to dialog itself.

[Dmitry Timoshkov]

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
---
 dlls/user32/dialog.c    | 2 ++
 dlls/user32/tests/msg.c | 9 +++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c
index c47bd571ae..0b33a579b5 100644
--- a/dlls/user32/dialog.c
+++ b/dlls/user32/dialog.c
@@ -691,6 +691,8 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate,
                         SendMessageW( focus, EM_SETSEL, 0, MAXLONG );
                     SetFocus( focus );
                 }
+                else
+                    SetFocus( hwnd );
             }
         }
 
diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
index 2fdb118e84..366a138b52 100644
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -13574,10 +13574,12 @@ static const struct message WmCreateDialogParamSeq_1[] = {
     { WM_MOVE, sent },
     { WM_SETFONT, sent },
     { WM_INITDIALOG, sent },
-    { WM_GETDLGCODE, sent|wparam|lparam, 0, 0 },
+    { WM_GETDLGCODE, sent|wparam|lparam|optional, 0, 0 }, /* FIXME: Wine doesn't send it */
     { HCBT_SETFOCUS, hook },
     { HCBT_ACTIVATE, hook },
-    { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE },
+    { WM_QUERYNEWPALETTE, sent|optional },
+    { WM_PALETTEISCHANGING, sent|optional },
+    { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE },
     { WM_ACTIVATEAPP, sent|wparam, 1 },
     { WM_NCACTIVATE, sent },
     { WM_ACTIVATE, sent|wparam, 1 },
@@ -13760,9 +13762,8 @@ static void test_dialog_messages(void)
     flush_sequence();
     hdlg = CreateDialogParamA(0, "CLASS_TEST_DIALOG_2", 0, test_dlg_proc, 1);
     ok(IsWindow(hdlg), "CreateDialogParam failed\n");
-    ok_sequence(WmCreateDialogParamSeq_1, "CreateDialogParam_1", TRUE);
+    ok_sequence(WmCreateDialogParamSeq_1, "CreateDialogParam_1", FALSE);
     hfocus = GetFocus();
-todo_wine
     ok(hfocus == hdlg, "wrong focus %p\n", hfocus);
     EndDialog(hdlg, 0);
     DestroyWindow(hdlg);
-- 
2.17.1

[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=45119

Your paranoid android.


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

user32:
menu.c:2354: Test failed: test 27
menu: Timeout
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

=== debian9 (64 bit WoW report) ===

user32:
clipboard.c:833: Test failed: 1: gle 5
clipboard.c:838: Test failed: 1.0: got 0000 instead of 0007
clipboard.c:868: Test failed: 1: gle 1418
clipboard.c:717: Test failed: 2: gle 5
clipboard.c:719: Test failed: 2: gle 1418
clipboard.c:746: Test failed: 2: count 4
clipboard.c:749: Test failed: 2: gle 1418
clipboard.c:760: Test failed: 2: gle 5
clipboard.c:765: Test failed: 2.0: got 0000 instead of 000d
clipboard.c:805: Test failed: 2: gle 1418
clipboard.c:815: Test failed: 2: count 4
clipboard.c:818: Test failed: 2: gle 1418
clipboard.c:833: Test failed: 2: gle 5
clipboard.c:838: Test failed: 2.0: got 0000 instead of 000d
clipboard.c:868: Test failed: 2: gle 1418
clipboard.c:717: Test failed: 3: gle 5
clipboard.c:719: Test failed: 3: gle 1418
clipboard.c:746: Test failed: 3: count 5
clipboard.c:749: Test failed: 3: gle 1418
clipboard.c:755: Test failed: 3: 0003 not available
clipboard.c:757: Test failed: 3: count 5 instead of 2
clipboard.c:760: Test failed: 3: gle 5
clipboard.c:765: Test failed: 3.0: got 0000 instead of 000e
clipboard.c:805: Test failed: 3: gle 1418
clipboard.c:815: Test failed: 3: count 5
clipboard.c:818: Test failed: 3: gle 1418
clipboard.c:826: Test failed: 3: 0003 not available
clipboard.c:828: Test failed: 3: count 5 instead of 2
clipboard.c:833: Test failed: 3: gle 5
clipboard.c:838: Test failed: 3.0: got 0000 instead of 000e
clipboard.c:868: Test failed: 3: gle 1418
clipboard.c:717: Test failed: 4: gle 5
clipboard.c:719: Test failed: 4: gle 1418
clipboard.c:746: Test failed: 4: count 6
clipboard.c:749: Test failed: 4: gle 1418
clipboard.c:757: Test failed: 4: count 6 instead of 2
clipboard.c:760: Test failed: 4: gle 5
clipboard.c:765: Test failed: 4.0: got 0000 instead of 0003
clipboard.c:805: Test failed: 4: gle 1418
clipboard.c:815: Test failed: 4: count 6
clipboard.c:818: Test failed: 4: gle 1418
clipboard.c:828: Test failed: 4: count 6 instead of 2
clipboard.c:833: Test failed: 4: gle 5
clipboard.c:838: Test failed: 4.0: got 0000 instead of 0003
clipboard.c:868: Test failed: 4: gle 1418
clipboard.c:717: Test failed: 5: gle 5
clipboard.c:719: Test failed: 5: gle 1418
clipboard.c:746: Test failed: 5: count 7
clipboard.c:749: Test failed: 5: gle 1418
clipboard.c:755: Test failed: 5: 0008 not available
clipboard.c:755: Test failed: 5: 0011 not available
clipboard.c:757: Test failed: 5: count 7 instead of 3
clipboard.c:760: Test failed: 5: gle 5
clipboard.c:765: Test failed: 5.0: got 0000 instead of 0002
clipboard.c:805: Test failed: 5: gle 1418
clipboard.c:815: Test failed: 5: count 7
clipboard.c:818: Test failed: 5: gle 1418
clipboard.c:826: Test failed: 5: 0008 not available
clipboard.c:826: Test failed: 5: 0011 not available
clipboard.c:828: Test failed: 5: count 7 instead of 3
clipboard.c:833: Test failed: 5: gle 5
clipboard.c:838: Test failed: 5.0: got 0000 instead of 0002
clipboard.c:868: Test failed: 5: gle 1418
clipboard.c:717: Test failed: 6: gle 5
clipboard.c:719: Test failed: 6: gle 1418
clipboard.c:746: Test failed: 6: count 8
clipboard.c:749: Test failed: 6: gle 1418
clipboard.c:755: Test failed: 6: 0011 not available
clipboard.c:757: Test failed: 6: count 8 instead of 3
clipboard.c:760: Test failed: 6: gle 5
clipboard.c:765: Test failed: 6.0: got 0000 instead of 0008
clipboard.c:805: Test failed: 6: gle 1418
clipboard.c:815: Test failed: 6: count 8
clipboard.c:818: Test failed: 6: gle 1418
clipboard.c:826: Test failed: 6: 0011 not available
clipboard.c:828: Test failed: 6: count 8 instead of 3
clipboard.c:833: Test failed: 6: gle 5
clipboard.c:838: Test failed: 6.0: got 0000 instead of 0008
clipboard.c:868: Test failed: 6: gle 1418
clipboard.c:717: Test failed: 7: gle 5
clipboard.c:719: Test failed: 7: gle 1418
clipboard.c:746: Test failed: 7: count 9
clipboard.c:749: Test failed: 7: gle 1418
clipboard.c:757: Test failed: 7: count 9 instead of 3
clipboard.c:760: Test failed: 7: gle 5
clipboard.c:765: Test failed: 7.0: got 0000 instead of 0011
clipboard.c:805: Test failed: 7: gle 1418
clipboard.c:815: Test failed: 7: count 9
clipboard.c:818: Test failed: 7: gle 1418
clipboard.c:828: Test failed: 7: count 9 instead of 3
clipboard.c:833: Test failed: 7: gle 5
clipboard.c:838: Test failed: 7.0: got 0000 instead of 0011
clipboard.c:868: Test failed: 7: gle 1418
clipboard.c:874: Test failed: gle 5
clipboard.c:876: Test failed: gle 1418
clipboard.c:878: Test failed: gle 1418