[PATCH 0/2] MR7619: comctl32: Implement EVENT_OBJECT_VALUECHANGE for edit controls.
From: Esme Povirk <esme(a)codeweavers.com> --- dlls/comctl32/edit.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index e57f3d328d1..86a8e3c1774 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -2639,6 +2639,8 @@ static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, const WCHAR *lpsz_r if (!notify_parent(es, EN_CHANGE)) return; } EDIT_InvalidateUniscribeData(es); + + NotifyWinEvent(EVENT_OBJECT_VALUECHANGE, es->hwndSelf, OBJID_CLIENT, 0); } @@ -2908,6 +2910,7 @@ static BOOL EDIT_EM_Undo(EDITSTATE *es) EDIT_EM_ScrollCaret(es); Free(utext); + NotifyWinEvent(EVENT_OBJECT_VALUECHANGE, es->hwndSelf, OBJID_CLIENT, 0); TRACE("after UNDO:insertion length = %d, deletion buffer = %s\n", es->undo_insert_count, debugstr_w(es->undo_text)); return TRUE; @@ -3094,6 +3097,7 @@ static LRESULT EDIT_WM_Char(EDITSTATE *es, WCHAR c) EDIT_EM_ReplaceSel(es, TRUE, &c, 1, TRUE, TRUE); break; } + return 1; } @@ -3401,6 +3405,7 @@ static LRESULT EDIT_WM_KeyDown(EDITSTATE *es, INT key) if (!notify_parent(es, EN_UPDATE)) break; notify_parent(es, EN_CHANGE); EDIT_EM_ScrollCaret(es); + NotifyWinEvent(EVENT_OBJECT_VALUECHANGE, es->hwndSelf, OBJID_CLIENT, 0); } } break; @@ -3838,6 +3843,7 @@ static void EDIT_WM_SetText(EDITSTATE *es, LPCWSTR text) EDIT_EM_ScrollCaret(es); EDIT_UpdateScrollInfo(es); EDIT_InvalidateUniscribeData(es); + NotifyWinEvent(EVENT_OBJECT_VALUECHANGE, es->hwndSelf, OBJID_CLIENT, 0); } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/7619
From: Esme Povirk <esme(a)codeweavers.com> --- dlls/comctl32/tests/edit.c | 57 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index 92091df8fa6..ec74311909b 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -48,6 +48,47 @@ enum msg_id static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; +static void CALLBACK msg_winevent_proc(HWINEVENTHOOK hevent, + DWORD event, + HWND hwnd, + LONG object_id, + LONG child_id, + DWORD thread_id, + DWORD event_time) +{ + struct message msg = {0}; + char class_name[256]; + + /* ignore window and other system events */ + if (object_id != OBJID_CLIENT) return; + + /* ignore events not from an edit control */ + if (!GetClassNameA(hwnd, class_name, ARRAY_SIZE(class_name)) || + strcmp(class_name, WC_EDITA) != 0) + return; + + msg.message = event; + msg.flags = winevent_hook|wparam|lparam; + msg.wParam = object_id; + msg.lParam = child_id; + add_message(sequences, COMBINED_SEQ_INDEX, &msg); +} + +static void init_winevent_hook(void) { + hwineventhook = SetWinEventHook(EVENT_MIN, EVENT_MAX, GetModuleHandleA(0), msg_winevent_proc, + 0, GetCurrentThreadId(), WINEVENT_INCONTEXT); + if (!hwineventhook) + win_skip( "no win event hook support\n" ); +} + +static void uninit_winevent_hook(void) { + if (!hwineventhook) + return; + + UnhookWinEvent(hwineventhook); + hwineventhook = 0; +} + struct edit_notify { int en_change, en_maxtext, en_update; }; @@ -3409,6 +3450,7 @@ static void test_wordbreak_proc(void) static const struct message setfocus_combined_seq[] = { { WM_KILLFOCUS, sent|id, 0, 0, PARENT_ID }, + { EVENT_OBJECT_FOCUS, winevent_hook|lparam, 0, 0 }, { WM_SETFOCUS, sent|id, 0, 0, EDIT_ID }, { WM_COMMAND, sent|wparam|id, MAKEWPARAM(1, EN_SETFOCUS), 0, PARENT_ID }, { WM_PAINT, sent|id, 0, 0, EDIT_ID }, @@ -3430,6 +3472,7 @@ static const struct message killfocus_combined_seq[] = static const struct message setfocus_sent_only_combined_seq[] = { { WM_KILLFOCUS, sent|id, 0, 0, PARENT_ID }, + { EVENT_OBJECT_FOCUS, winevent_hook|lparam, 0, 0 }, { WM_SETFOCUS, sent|id, 0, 0, EDIT_ID }, { WM_COMMAND, sent|wparam|id, MAKEWPARAM(1, EN_SETFOCUS), 0, PARENT_ID }, { 0 } @@ -3582,9 +3625,13 @@ static const struct message wm_ime_composition_seq[] = {WM_IME_CHAR, sent | wparam | defwinproc, 'e'}, {WM_IME_ENDCOMPOSITION, sent}, {WM_CHAR, sent | wparam, 'W'}, + {EVENT_OBJECT_VALUECHANGE, winevent_hook|lparam, 0, 0}, {WM_CHAR, sent | wparam, 'i'}, + {EVENT_OBJECT_VALUECHANGE, winevent_hook|lparam, 0, 0}, {WM_CHAR, sent | wparam, 'n'}, + {EVENT_OBJECT_VALUECHANGE, winevent_hook|lparam, 0, 0}, {WM_CHAR, sent | wparam, 'e'}, + {EVENT_OBJECT_VALUECHANGE, winevent_hook|lparam, 0, 0}, {0} }; @@ -3597,9 +3644,13 @@ static const struct message wm_ime_composition_korean_seq[] = {WM_IME_CHAR, sent | wparam | defwinproc, 'n'}, {WM_IME_CHAR, sent | wparam | defwinproc, 'e'}, {WM_CHAR, sent | wparam, 'W'}, + {EVENT_OBJECT_VALUECHANGE, winevent_hook|lparam, 0, 0}, {WM_CHAR, sent | wparam, 'i'}, + {EVENT_OBJECT_VALUECHANGE, winevent_hook|lparam, 0, 0}, {WM_CHAR, sent | wparam, 'n'}, + {EVENT_OBJECT_VALUECHANGE, winevent_hook|lparam, 0, 0}, {WM_CHAR, sent | wparam, 'e'}, + {EVENT_OBJECT_VALUECHANGE, winevent_hook|lparam, 0, 0}, {0} }; @@ -3607,6 +3658,7 @@ static const struct message wm_ime_char_seq[] = { {WM_IME_CHAR, sent | wparam, '0'}, {WM_CHAR, sent | wparam, '0'}, + {EVENT_OBJECT_VALUECHANGE, winevent_hook|lparam, 0, 0}, {0} }; @@ -3614,6 +3666,7 @@ static const struct message eimes_getcompstratonce_seq[] = { {WM_IME_STARTCOMPOSITION, sent}, {WM_IME_COMPOSITION, sent | wparam, 'W'}, + {EVENT_OBJECT_VALUECHANGE, winevent_hook|lparam, 0, 0}, {WM_IME_ENDCOMPOSITION, sent}, {0} }; @@ -3850,6 +3903,8 @@ START_TEST(edit) init_msg_sequences(sequences, NUM_MSG_SEQUENCES); + init_winevent_hook(); + hinst = GetModuleHandleA(NULL); b = register_classes(); ok(b, "Failed to register test classes.\n"); @@ -3890,5 +3945,7 @@ START_TEST(edit) UnregisterWindowClasses(); + uninit_winevent_hook(); + unload_v6_module(ctx_cookie, hCtx); } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/7619
Nikolay Sivov (@nsivov) commented about dlls/comctl32/edit.c:
break; case 'A': if (control) { if (EDIT_EM_SetSel(es, 0, get_text_length(es), FALSE)) { if (!notify_parent(es, EN_UPDATE)) break; notify_parent(es, EN_CHANGE); EDIT_EM_ScrollCaret(es); + NotifyWinEvent(EVENT_OBJECT_VALUECHANGE, es->hwndSelf, OBJID_CLIENT, 0); }
Is this one necessary? It's Select All function, there is no text change. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/7619#note_98518
On Thu Mar 20 09:48:06 2025 +0000, Nikolay Sivov wrote:
Is this one necessary? It's Select All function, there is no text change. I guess not then. Out of curiosity, why is EN_CHANGE sent in this case?
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/7619#note_98649
participants (3)
-
Esme Povirk -
Esme Povirk (＠madewokherd)
-
Nikolay Sivov (＠nsivov)