[PATCH v16 3/3] comctl32/toolbar: Forward WM_NOTIFY CBEN_ENDEDITW and CBEN_ENDEDITA.

[Alanas Tebuev]

From: Alanas Tebuev

This makes 7-Zip File Manager press enter in path input work.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=57178
---
 dlls/comctl32/tests/toolbar.c | 16 ++++++++--------
 dlls/comctl32/toolbar.c       | 14 ++++++++++++++
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c
index df322dcd6da..4c11cdbab96 100644
--- a/dlls/comctl32/tests/toolbar.c
+++ b/dlls/comctl32/tests/toolbar.c
@@ -2913,14 +2913,14 @@ static void test_WM_NOTIFY(void)

test_WM_NOTIFY_expect_CBEN_ENDEDITW = TEST_WM_NOTIFY_FORWARD_NO_CONVERT;
     ret = SendMessageW(toolbar, WM_NOTIFY, 0, (LPARAM)&test_WM_NOTIFY_NMCBEENDEDITW);
-    todo_wine ok(ret == 0xabcd0006, "SendMessageW returned 0x%Ix.\n", ret);
-    todo_wine ok(!test_WM_NOTIFY_expect_CBEN_ENDEDITW, "Toolbar didn't forward WM_NOTIFY to parent.\n");
+    ok(ret == 0xabcd0006, "SendMessageW returned 0x%Ix.\n", ret);
+    ok(!test_WM_NOTIFY_expect_CBEN_ENDEDITW, "Toolbar didn't forward WM_NOTIFY to parent.\n");
     test_WM_NOTIFY_expect_CBEN_ENDEDITW = TEST_WM_NOTIFY_NO_FORWARD;

test_WM_NOTIFY_expect_CBEN_ENDEDITA = TEST_WM_NOTIFY_FORWARD_NO_CONVERT;
     ret = SendMessageA(toolbar, WM_NOTIFY, 0, (LPARAM)&test_WM_NOTIFY_NMCBEENDEDITA);
-    todo_wine ok(ret == 0xabcd0007, "SendMessageA returned 0x%Ix.\n", ret);
-    todo_wine ok(!test_WM_NOTIFY_expect_CBEN_ENDEDITA, "Toolbar didn't forward WM_NOTIFY to parent.\n");
+    ok(ret == 0xabcd0007, "SendMessageA returned 0x%Ix.\n", ret);
+    ok(!test_WM_NOTIFY_expect_CBEN_ENDEDITA, "Toolbar didn't forward WM_NOTIFY to parent.\n");
     test_WM_NOTIFY_expect_CBEN_ENDEDITA = TEST_WM_NOTIFY_NO_FORWARD;

parent_WM_NOTIFYFORMAT_return = NFR_ANSI;
@@ -2928,13 +2928,13 @@ static void test_WM_NOTIFY(void)

test_WM_NOTIFY_expect_CBEN_ENDEDITA = TEST_WM_NOTIFY_FORWARD_CONVERT;
     ret = SendMessageW(toolbar, WM_NOTIFY, 0, (LPARAM)&test_WM_NOTIFY_NMCBEENDEDITW);
-    todo_wine ok(ret == 0xabcd0007, "SendMessageW returned 0x%Ix.\n", ret);
-    todo_wine ok(!test_WM_NOTIFY_expect_CBEN_ENDEDITA, "Toolbar didn't convert and forward WM_NOTIFY to parent.\n");
+    ok(ret == 0xabcd0007, "SendMessageW returned 0x%Ix.\n", ret);
+    ok(!test_WM_NOTIFY_expect_CBEN_ENDEDITA, "Toolbar didn't convert and forward WM_NOTIFY to parent.\n");

test_WM_NOTIFY_expect_CBEN_ENDEDITA = TEST_WM_NOTIFY_FORWARD_NO_CONVERT;
     ret = SendMessageA(toolbar, WM_NOTIFY, 0, (LPARAM)&test_WM_NOTIFY_NMCBEENDEDITA);
-    todo_wine ok(ret == 0xabcd0007, "SendMessageA returned 0x%Ix.\n", ret);
-    todo_wine ok(!test_WM_NOTIFY_expect_CBEN_ENDEDITA, "Toolbar didn't forward WM_NOTIFY to parent.\n");
+    ok(ret == 0xabcd0007, "SendMessageA returned 0x%Ix.\n", ret);
+    ok(!test_WM_NOTIFY_expect_CBEN_ENDEDITA, "Toolbar didn't forward WM_NOTIFY to parent.\n");
     test_WM_NOTIFY_expect_CBEN_ENDEDITA = TEST_WM_NOTIFY_NO_FORWARD;

DestroyWindow(toolbar);
diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c
index 690a02db6ee..84aaf648141 100644
--- a/dlls/comctl32/toolbar.c
+++ b/dlls/comctl32/toolbar.c
@@ -6359,7 +6359,21 @@ TOOLBAR_Notify (TOOLBAR_INFO *infoPtr, LPNMHDR lpnmh)
         FIXME("TTN_GETDISPINFOA - should not be received; please report\n");
         return 0;

+    case CBEN_ENDEDITW:
+        if (infoPtr->bUnicode)
+        {
+            TRACE("Forwarding CBEN_ENDEDITW (no conversion).\n");
+            return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, lpnmh->idFrom, (LPARAM)lpnmh);
+        }
+        TRACE("Converting CBEN_ENDEDITW to CBEN_ENDEDITA and forwarding.\n");
+        return COMCTL32_ForwardNotifyToAnsiWindow(infoPtr->hwndNotify, lpnmh, NULL);
+
+    case CBEN_ENDEDITA:
+        TRACE("Forwarding CBEN_ENDEDITA (no conversion).\n");
+        return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, lpnmh->idFrom, (LPARAM)lpnmh);
+
     default:
+        WARN("Should WM_NOTIFY NMHDR code 0x%x be forwarded?\n", lpnmh->code);
         return 0;
     }
 }