[PATCH v2] comctl32/edit/tests: Add interactive test showing a rendering glitch

[Fabian Maurer]

v2: Only run test when WINETEST_INTERACTIVE is set

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de>
---
 dlls/comctl32/tests/edit.c  | 35 +++++++++++++++++++++++++++++++++++
 dlls/comctl32/tests/rsrc.rc | 12 ++++++++++++
 2 files changed, 47 insertions(+)

diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c
index 7e9e7e7634..fa8ded377d 100644
--- a/dlls/comctl32/tests/edit.c
+++ b/dlls/comctl32/tests/edit.c
@@ -3094,6 +3094,36 @@ static void test_change_focus(void)
     DestroyWindow(hwnd);
 }
 
+static INT_PTR CALLBACK dialog_proc_interactive(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam)
+{
+    switch (msg)
+    {
+        case WM_COMMAND:
+            if (HIWORD(wparam) == BN_CLICKED)
+            {
+                EndDialog(hdlg, LOWORD(wparam));
+            }
+            break;
+        case WM_CLOSE:
+            EndDialog(hdlg, IDCANCEL);
+            break;
+
+        default:
+            break;
+    }
+
+    return FALSE;
+}
+
+static void test_rendering_interactive(void)
+{
+    int button_clicked;
+
+    button_clicked = DialogBoxParamA(GetModuleHandleA(NULL), "EDIT_OVERLAPPING_LABEL", NULL, dialog_proc_interactive, 0);
+    todo_wine
+    ok(button_clicked == IDOK, "Interactive test 'edit overlapping label' failed.\n");
+}
+
 START_TEST(edit)
 {
     ULONG_PTR ctx_cookie;
@@ -3139,6 +3169,11 @@ START_TEST(edit)
     test_wordbreak_proc();
     test_change_focus();
 
+    if (winetest_interactive)
+    {
+        test_rendering_interactive();
+    }
+
     UnregisterWindowClasses();
 
     unload_v6_module(ctx_cookie, hCtx);
diff --git a/dlls/comctl32/tests/rsrc.rc b/dlls/comctl32/tests/rsrc.rc
index 327aa225e1..959130e2f1 100644
--- a/dlls/comctl32/tests/rsrc.rc
+++ b/dlls/comctl32/tests/rsrc.rc
@@ -78,6 +78,18 @@ FONT 8, "MS Shell Dlg"
 {
 }
 
+EDIT_OVERLAPPING_LABEL DIALOG 0, 0, 200, 80
+STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER
+CAPTION "Does the edit box look alright?"
+FONT 8, "MS Shell Dlg"
+{
+    LTEXT "Title:", -1, 5, 5, 70, 15, BS_CENTER
+    EDITTEXT 1000, 60, 5, 450, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_WANTRETURN
+
+    PUSHBUTTON "OK", IDOK, 20, 60, 50, 14,  WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "Broken", IDNO, 100, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+}
+
 STRINGTABLE 
 {
     IDS_TBADD1           "abc"
-- 
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=38879

Your paranoid android.


=== wvistau64_zh_CN (32 bit edit) ===
edit.c:1542: Test failed: 0: got 2, 1
edit.c:1563: Test failed: 0: got 2, 1
edit.c:1577: Test failed: 0: got 2, 1
edit.c:1591: Test failed: 0: got 2, 1
edit.c:1717: Test failed: got 1
edit.c:1718: Test failed: got 1
edit.c:1724: Test failed: got 1
edit.c:1740: Test failed: got 2
edit.c:1763: Test failed: got 1

=== wvistau64 (32 bit listbox) ===
listbox.c:939: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18

=== wvistau64_zh_CN (32 bit listbox) ===
listbox.c:939: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18

=== wvistau64_fr (32 bit listbox) ===
listbox.c:939: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18

=== wvistau64_he (32 bit listbox) ===
listbox.c:939: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18

=== wvistau64 (64 bit listbox) ===
listbox.c:939: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18

=== w7u (32 bit datetime) ===
TestBot process got stuck or died unexpectedly
The previous 1 run(s) terminated abnormally

[Fabian Maurer]

Most likely unrelated.

Regards,
Fabian Maurer

[Nikolay Sivov]

Do you know what's going on there? Is this about Edit painting logic, or 
about Edit being used in a dialog?

[Fabian Maurer]

On Mittwoch, 6. Juni 2018 12:23:48 CEST Nikolay Sivov wrote:
> Do you know what's going on there? Is this about Edit painting 
> logic, or
> about Edit being used in a dialog?

I don't know what exactly causes this issue, but it seems comctl32 
specific. Probably unrelated to a dialog, but I noticed it while 
working on my interactive taskdialog-creator.

Regards,
Fabian Maurer