From 90cf805c77e4c4a745123b756797e3f6833845b0 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Tue, 8 Apr 2008 15:46:24 -0700 Subject: [PATCH 2/2] user32: add edit control check to see if its in a dialog on WM_CHAR/VK_TAB. --- dlls/user32/edit.c | 7 ++----- dlls/user32/tests/edit.c | 6 ++---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 3111015..1b30f9b 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -861,11 +861,6 @@ static LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg, } } } - else - { - if (charW == VK_TAB) - break; - } result = EDIT_WM_Char(es, charW); break; } @@ -4045,6 +4040,8 @@ static LRESULT EDIT_WM_Char(EDITSTATE *es, WCHAR c) if ((es->style & ES_MULTILINE) && !(es->style & ES_READONLY)) { static const WCHAR tabW[] = {'\t',0}; + if (EDIT_IsInsideDialog(es)) + break; EDIT_EM_ReplaceSel(es, TRUE, tabW, TRUE, TRUE); } break; diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 82c4ee0..e5a69ac 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1719,15 +1719,13 @@ static void test_tab(void) ok(TRUE == r, "Expected: %d, got: %d\n", TRUE, r); r = SendMessage(hwEdit, WM_CHAR, VK_TAB, 0); - todo_wine ok(1 == r, "Expected: %d, got: %d\n", 1, r); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); /* get text */ buffer[0] = 0; r = SendMessage(hwEdit, WM_GETTEXT, 16, (LPARAM) buffer); - todo_wine { ok(1 == r, "Expected: %d, got len %d\n", 1, r); ok(0 == strcmp(buffer, "\t"), "expected \"\\t\", got \"%s\"\n", buffer); - } DestroyWindow (hwEdit); @@ -1741,7 +1739,7 @@ static void test_tab(void) ok(TRUE == r, "Expected: %d, got: %d\n", TRUE, r); r = SendMessage(hwEdit, WM_CHAR, VK_TAB, 0); - todo_wine ok(1 == r, "Expected: %d, got: %d\n", 1, r); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); /* get text */ buffer[0] = 0; -- 1.5.3.6