[PATCH 0/2] MR7602: comctl32/tests: Add a LVN_ENDLABELEDIT test with empty text.

[Nikolay Sivov (＠nsivov)]

Signed-off-by: Nikolay Sivov

[PATCH 1/2] comctl32/tests: Add a LVN_ENDLABELEDIT test with empty text.

[Nikolay Sivov]

From: Nikolay Sivov

Signed-off-by: Nikolay Sivov 
---
 dlls/comctl32/tests/listview.c | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c
index 1a212e5d0ad..cf8b445c545 100644
--- a/dlls/comctl32/tests/listview.c
+++ b/dlls/comctl32/tests/listview.c
@@ -4707,6 +4707,35 @@ static void test_editbox(void)
     expect(lstrlenA(item.pszText), r);
     ok(strcmp(buffer, testitem2A) == 0, "Expected item text to change\n");

+    /* Modify to empty text, check notification data. */
+    SetFocus(hwnd);
+    hwndedit = (HWND)SendMessageA(hwnd, LVM_EDITLABELA, 0, 0);
+    ok(!!hwndedit, "Failed to edit a label.\n");
+    r = SendMessageA(hwndedit, WM_SETTEXT, 0, (LPARAM)"");
+    ok(r, "Unexpected return value %d.\n", r);
+    g_editbox_disp_info.item.pszText = NULL;
+    r = SendMessageA(hwndedit, WM_KEYDOWN, VK_RETURN, 0);
+    ok(!r, "Unexpected return value %d.\n", r);
+    todo_wine
+    ok(g_editbox_disp_info.item.pszText != NULL, "Unexpected notification text.\n");
+    memset(&item, 0, sizeof(item));
+    item.pszText = buffer;
+    item.cchTextMax = sizeof(buffer);
+    r = SendMessageA(hwnd, LVM_GETITEMTEXTA, 0, (LPARAM)&item);
+    todo_wine
+    ok(!r, "Unexpected return value %d.\n", r);
+    todo_wine
+    ok(!*buffer, "Unexpected item text %s.\n", debugstr_a(buffer));
+
+    /* end edit with saving */
+    SetFocus(hwnd);
+    hwndedit = (HWND)SendMessageA(hwnd, LVM_EDITLABELA, 0, 0);
+    flush_sequences(sequences, NUM_MSG_SEQUENCES);
+    r = SendMessageA(hwndedit, WM_KEYDOWN, VK_RETURN, 0);
+    expect(0, r);
+    ok_sequence(sequences, PARENT_SEQ_INDEX, edit_end_nochange,
+                "edit box - end edit, no change, return", TRUE);
+
     /* LVM_EDITLABEL with -1 destroys current edit */
     hwndedit = (HWND)SendMessageA(hwnd, LVM_GETEDITCONTROL, 0, 0);
     ok(hwndedit == NULL, "Expected Edit window not to be created\n");

[PATCH 2/2] comctl32/listview: Never use null buffer with LVN_ENDLABELEDIT on a text change.

[Anders Kjersem]

From: Anders Kjersem

Signed-off-by: Nikolay Sivov 
---
 dlls/comctl32/listview.c       | 17 +++++++----------
 dlls/comctl32/tests/listview.c |  3 ---
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c
index 1a0c919e962..8de14280575 100644
--- a/dlls/comctl32/listview.c
+++ b/dlls/comctl32/listview.c
@@ -5921,18 +5921,15 @@ static BOOL LISTVIEW_EndEditLabelT(LISTVIEW_INFO *infoPtr, BOOL storeText, BOOL

if (storeText)
     {
-        DWORD len = isW ? GetWindowTextLengthW(infoPtr->hwndEdit) : GetWindowTextLengthA(infoPtr->hwndEdit);
+        DWORD len = (isW ? GetWindowTextLengthW(infoPtr->hwndEdit) : GetWindowTextLengthA(infoPtr->hwndEdit)) + 1;

-        if (len++)
-        {
-            if (!(pszText = Alloc(len * (isW ? sizeof(WCHAR) : sizeof(CHAR)))))
-                return FALSE;
+        if (!(pszText = Alloc(len * (isW ? sizeof(WCHAR) : sizeof(CHAR)))))
+            return FALSE;

-            if (isW)
-                GetWindowTextW(infoPtr->hwndEdit, pszText, len);
-            else
-                GetWindowTextA(infoPtr->hwndEdit, (CHAR*)pszText, len);
-        }
+        if (isW)
+            GetWindowTextW(infoPtr->hwndEdit, pszText, len);
+        else
+            GetWindowTextA(infoPtr->hwndEdit, (CHAR*)pszText, len);
     }

TRACE("(pszText=%s, isW=%d)\n", debugtext_t(pszText, isW), isW);
diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c
index cf8b445c545..b0139f4edff 100644
--- a/dlls/comctl32/tests/listview.c
+++ b/dlls/comctl32/tests/listview.c
@@ -4716,15 +4716,12 @@ static void test_editbox(void)
     g_editbox_disp_info.item.pszText = NULL;
     r = SendMessageA(hwndedit, WM_KEYDOWN, VK_RETURN, 0);
     ok(!r, "Unexpected return value %d.\n", r);
-    todo_wine
     ok(g_editbox_disp_info.item.pszText != NULL, "Unexpected notification text.\n");
     memset(&item, 0, sizeof(item));
     item.pszText = buffer;
     item.cchTextMax = sizeof(buffer);
     r = SendMessageA(hwnd, LVM_GETITEMTEXTA, 0, (LPARAM)&item);
-    todo_wine
     ok(!r, "Unexpected return value %d.\n", r);
-    todo_wine
     ok(!*buffer, "Unexpected item text %s.\n", debugstr_a(buffer));

/* end edit with saving */

[PATCH 0/2] MR7602: comctl32/tests: Add a LVN_ENDLABELEDIT test with empty text. - approved

[Nikolay Sivov (＠nsivov)]

This merge request was approved by Nikolay Sivov.