winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
April 2008
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
4 participants
1278 discussions
Start a n
N
ew thread
Maarten Lankhorst : quartz: Make wait timeout in directsound slightly larger.
by Alexandre Julliard
08 Apr '08
08 Apr '08
Module: wine Branch: master Commit: d1aa222e85938424bf85b95f395df5a13877b644 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d1aa222e85938424bf85b95f3…
Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Apr 7 15:44:51 2008 -0700 quartz: Make wait timeout in directsound slightly larger. --- dlls/quartz/dsoundrender.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 0cfd163..e65ae12 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -188,7 +188,7 @@ static HRESULT DSoundRender_SendSampleData(DSoundRenderImpl* This, const BYTE *d /* Wait for enough of the buffer to empty before filling it */ if(buf_free < This->buf_size/4) { - Sleep(10); + Sleep(50); continue; }
1
0
0
0
Alexandre Julliard : user32: Get rid of the debug mark option in the system menu.
by Alexandre Julliard
08 Apr '08
08 Apr '08
Module: wine Branch: master Commit: 806d08c206c36f1e35dd68b114bf8caf256cd2e0 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=806d08c206c36f1e35dd68b11…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 8 12:20:04 2008 +0200 user32: Get rid of the debug mark option in the system menu. --- dlls/user32/nonclient.c | 4 ---- dlls/user32/resources/user32_Bg.rc | 2 -- dlls/user32/resources/user32_Ca.rc | 2 -- dlls/user32/resources/user32_Da.rc | 2 -- dlls/user32/resources/user32_De.rc | 2 -- dlls/user32/resources/user32_En.rc | 2 -- dlls/user32/resources/user32_Eo.rc | 1 - dlls/user32/resources/user32_Es.rc | 2 -- dlls/user32/resources/user32_Fi.rc | 2 -- dlls/user32/resources/user32_Fr.rc | 2 -- dlls/user32/resources/user32_Hu.rc | 2 -- dlls/user32/resources/user32_It.rc | 2 -- dlls/user32/resources/user32_Ja.rc | 1 - dlls/user32/resources/user32_Ko.rc | 2 -- dlls/user32/resources/user32_Nl.rc | 2 -- dlls/user32/resources/user32_No.rc | 2 -- dlls/user32/resources/user32_Pl.rc | 2 -- dlls/user32/resources/user32_Pt.rc | 4 ---- dlls/user32/resources/user32_Ro.rc | 2 -- dlls/user32/resources/user32_Ru.rc | 2 -- dlls/user32/resources/user32_Si.rc | 2 -- dlls/user32/resources/user32_Sk.rc | 2 -- dlls/user32/resources/user32_Tr.rc | 2 -- dlls/user32/resources/user32_Uk.rc | 2 -- dlls/user32/resources/user32_Wa.rc | 2 -- 25 files changed, 0 insertions(+), 52 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=806d08c206c36f1e35dd6…
1
0
0
0
Alexandre Julliard : libwine: Added mappings for codepage 1361 ( Korean Johab).
by Alexandre Julliard
08 Apr '08
08 Apr '08
Module: wine Branch: master Commit: 5fe73e6903c9ef4db2f6a90813396b174f6d5b9a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5fe73e6903c9ef4db2f6a9081…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 8 12:19:27 2008 +0200 libwine: Added mappings for codepage 1361 (Korean Johab). --- libs/wine/Makefile.in | 1 + libs/wine/c_1361.c | 8872 +++++++++++++++++++++++++++++++++++++++++++++++++ libs/wine/cpmap.pl | 12 +- libs/wine/cptable.c | 4 +- 4 files changed, 8885 insertions(+), 4 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=5fe73e6903c9ef4db2f6a…
1
0
0
0
Lei Zhang : user32: Handle VK_ESCAPE correctly in EDIT_WM_KeyDown.
by Alexandre Julliard
08 Apr '08
08 Apr '08
Module: wine Branch: master Commit: 6736ed82ed5cb416771390c5c1bee7781e95b61c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=6736ed82ed5cb416771390c5c…
Author: Lei Zhang <thestig(a)google.com> Date: Mon Apr 7 14:18:34 2008 -0700 user32: Handle VK_ESCAPE correctly in EDIT_WM_KeyDown. --- dlls/user32/edit.c | 4 ++++ dlls/user32/tests/edit.c | 17 ++++------------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index f359555..2159ab7 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -4610,6 +4610,10 @@ static LRESULT EDIT_WM_KeyDown(EDITSTATE *es, INT key) SendMessageW( hwndParent, WM_COMMAND, IDOK, (LPARAM)GetDlgItem( hwndParent, IDOK ) ); } break; + case VK_ESCAPE: + if (!(es->style & ES_MULTILINE)) + SendMessageW(GetParent(es->hwndSelf), WM_COMMAND, IDCANCEL, (LPARAM)GetDlgItem( GetParent(es->hwndSelf), IDCANCEL ) ); + break; } return 0; } diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 9542714..058d9fe 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -300,8 +300,6 @@ static INT_PTR CALLBACK edit_singleline_dialog_proc(HWND hdlg, UINT msg, WPARAM break; case 1: PostMessage(hedit, WM_KEYDOWN, VK_RETURN, 0x1c0001); - /* needed so the test does not wait for user input */ - PostMessage(hdlg, WM_USER, 0xfeedbeef, 0); break; case 2: PostMessage(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); @@ -330,8 +328,6 @@ static INT_PTR CALLBACK edit_singleline_dialog_proc(HWND hdlg, UINT msg, WPARAM case 7: PostMessage(hedit, WM_KEYDOWN, VK_RETURN, 0x1c0001); PostMessage(hedit, WM_CHAR, VK_RETURN, 0x1c0001); - /* needed so the test does not wait for user input */ - PostMessage(hdlg, WM_USER, 0xfeedbeef, 0); break; case 8: PostMessage(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); @@ -371,11 +367,6 @@ static INT_PTR CALLBACK edit_singleline_dialog_proc(HWND hdlg, UINT msg, WPARAM HWND hfocus = GetFocus(); int len = SendMessage(hedit, WM_GETTEXTLENGTH, 0, 0); - if (wparam == 0xfeedbeef) - { - EndDialog(hdlg, 66); - break; - } if (wparam != 0xdeadbeef) break; @@ -1872,7 +1863,7 @@ static void test_singleline_wantreturn_edit_dialog(void) /* tests for WM_KEYDOWN */ r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 0); - todo_wine ok(222 == r, "Expected %d, got %d\n", 222, r); + ok(222 == r, "Expected %d, got %d\n", 222, r); r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 1); ok(111 == r, "Expected %d, got %d\n", 111, r); r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 2); @@ -1888,7 +1879,7 @@ static void test_singleline_wantreturn_edit_dialog(void) /* tests for WM_KEYDOWN + WM_CHAR */ r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 6); - todo_wine ok(222 == r, "Expected %d, got %d\n", 222, r); + ok(222 == r, "Expected %d, got %d\n", 222, r); r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 7); ok(111 == r, "Expected %d, got %d\n", 111, r); r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 8); @@ -1896,7 +1887,7 @@ static void test_singleline_wantreturn_edit_dialog(void) /* tests for WM_KEYDOWN */ r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 0); - todo_wine ok(222 == r, "Expected %d, got %d\n", 222, r); + ok(222 == r, "Expected %d, got %d\n", 222, r); r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 1); ok(111 == r, "Expected %d, got %d\n", 111, r); r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 2); @@ -1912,7 +1903,7 @@ static void test_singleline_wantreturn_edit_dialog(void) /* tests for WM_KEYDOWN + WM_CHAR */ r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 6); - todo_wine ok(222 == r, "Expected %d, got %d\n", 222, r); + ok(222 == r, "Expected %d, got %d\n", 222, r); r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 7); ok(111 == r, "Expected %d, got %d\n", 111, r); r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 8);
1
0
0
0
Lei Zhang : user32: Handle ES_MULTILINE correctly for WM_KEYDOWN/VK_RETURN.
by Alexandre Julliard
08 Apr '08
08 Apr '08
Module: wine Branch: master Commit: 7f10fe07443a7eadb2b491981e69b1cbca9b5808 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7f10fe07443a7eadb2b491981…
Author: Lei Zhang <thestig(a)google.com> Date: Mon Apr 7 14:13:04 2008 -0700 user32: Handle ES_MULTILINE correctly for WM_KEYDOWN/VK_RETURN. --- dlls/user32/edit.c | 2 +- dlls/user32/tests/edit.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 8afc87a..f359555 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -4596,7 +4596,7 @@ static LRESULT EDIT_WM_KeyDown(EDITSTATE *es, INT key) break; case VK_RETURN: /* If the edit doesn't want the return send a message to the default object */ - if(!(es->style & ES_WANTRETURN)) + if(!(es->style & ES_MULTILINE) || !(es->style & ES_WANTRETURN)) { HWND hwndParent = GetParent(es->hwndSelf); DWORD dw = SendMessageW( hwndParent, DM_GETDEFID, 0, 0 ); diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 396f74d..9542714 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1898,7 +1898,7 @@ static void test_singleline_wantreturn_edit_dialog(void) r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 0); todo_wine ok(222 == r, "Expected %d, got %d\n", 222, r); r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 1); - todo_wine ok(111 == r, "Expected %d, got %d\n", 111, r); + ok(111 == r, "Expected %d, got %d\n", 111, r); r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 2); ok(444 == r, "Expected %d, got %d\n", 444, r); @@ -1914,7 +1914,7 @@ static void test_singleline_wantreturn_edit_dialog(void) r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 6); todo_wine ok(222 == r, "Expected %d, got %d\n", 222, r); r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 7); - todo_wine ok(111 == r, "Expected %d, got %d\n", 111, r); + ok(111 == r, "Expected %d, got %d\n", 111, r); r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 8); ok(444 == r, "Expected %d, got %d\n", 444, r); }
1
0
0
0
Lei Zhang : user32: Fix WM_CHAR return value for edit controls.
by Alexandre Julliard
08 Apr '08
08 Apr '08
Module: wine Branch: master Commit: c8a4bb8fff225aa74d9a2c115cde7f2c4d31c5ba URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c8a4bb8fff225aa74d9a2c115…
Author: Lei Zhang <thestig(a)google.com> Date: Mon Apr 7 14:11:58 2008 -0700 user32: Fix WM_CHAR return value for edit controls. --- dlls/user32/edit.c | 9 +++++---- dlls/user32/tests/edit.c | 25 ++++++++++++++++--------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index e6d2530..8afc87a 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -257,7 +257,7 @@ static BOOL EDIT_EM_Undo(EDITSTATE *es); /* * WM_XXX message handlers */ -static void EDIT_WM_Char(EDITSTATE *es, WCHAR c); +static LRESULT EDIT_WM_Char(EDITSTATE *es, WCHAR c); static void EDIT_WM_Command(EDITSTATE *es, INT code, INT id, HWND conrtol); static void EDIT_WM_ContextMenu(EDITSTATE *es, INT x, INT y); static void EDIT_WM_Copy(EDITSTATE *es); @@ -834,7 +834,7 @@ static LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg, strng[1] = wParam & 0xff; if (strng[0]) MultiByteToWideChar(CP_ACP, 0, strng, 2, &charW, 1); else MultiByteToWideChar(CP_ACP, 0, &strng[1], 1, &charW, 1); - EDIT_WM_Char(es, charW); + result = EDIT_WM_Char(es, charW); break; } /* fall through */ @@ -866,7 +866,7 @@ static LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg, if (charW == VK_TAB || charW == VK_RETURN) break; } - EDIT_WM_Char(es, charW); + result = EDIT_WM_Char(es, charW); break; } @@ -3994,7 +3994,7 @@ static BOOL EDIT_EM_Undo(EDITSTATE *es) * WM_CHAR * */ -static void EDIT_WM_Char(EDITSTATE *es, WCHAR c) +static LRESULT EDIT_WM_Char(EDITSTATE *es, WCHAR c) { BOOL control; @@ -4065,6 +4065,7 @@ static void EDIT_WM_Char(EDITSTATE *es, WCHAR c) } break; } + return 1; } diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 0eafc80..396f74d 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -731,6 +731,7 @@ static void test_edit_control_2(void) { HWND hwndMain; char szLocalString[MAXLEN]; + LONG r; /* Create main and edit windows. */ hwndMain = CreateWindow(szEditTest2Class, "ET2", WS_OVERLAPPEDWINDOW, @@ -749,9 +750,12 @@ static void test_edit_control_2(void) trace("EDIT: SETTEXT atomicity\n"); /* Send messages to "type" in the word 'foo'. */ - SendMessage(hwndET2, WM_CHAR, 'f', 1); - SendMessage(hwndET2, WM_CHAR, 'o', 1); - SendMessage(hwndET2, WM_CHAR, 'o', 1); + r = SendMessage(hwndET2, WM_CHAR, 'f', 1); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + r = SendMessage(hwndET2, WM_CHAR, 'o', 1); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + r = SendMessage(hwndET2, WM_CHAR, 'o', 1); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); /* 'foo' should have been changed to 'bar' by the UPDATE handler. */ GetWindowText(hwndET2, szLocalString, MAXLEN); ok(lstrcmp(szLocalString, "bar")==0, @@ -1553,7 +1557,8 @@ static void test_espassword(void) /* select all, cut (ctrl-x) */ SendMessage(hwEdit, EM_SETSEL, 0, -1); - SendMessage(hwEdit, WM_CHAR, 24, 0); + r = SendMessage(hwEdit, WM_CHAR, 24, 0); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); /* get text */ r = SendMessage(hwEdit, WM_GETTEXT, 1024, (LPARAM) buffer); @@ -1569,8 +1574,10 @@ static void test_espassword(void) /* select all, copy (ctrl-c) and paste (ctrl-v) */ SendMessage(hwEdit, EM_SETSEL, 0, -1); - SendMessage(hwEdit, WM_CHAR, 3, 0); - SendMessage(hwEdit, WM_CHAR, 22, 0); + r = SendMessage(hwEdit, WM_CHAR, 3, 0); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + r = SendMessage(hwEdit, WM_CHAR, 22, 0); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); /* get text */ buffer[0] = 0; @@ -1607,7 +1614,7 @@ static void test_undo(void) /* cut (ctrl-x) */ r = SendMessage(hwEdit, WM_CHAR, 24, 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; @@ -1617,7 +1624,7 @@ static void test_undo(void) /* undo (ctrl-z) */ r = SendMessage(hwEdit, WM_CHAR, 26, 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; @@ -1627,7 +1634,7 @@ static void test_undo(void) /* undo again (ctrl-z) */ r = SendMessage(hwEdit, WM_CHAR, 26, 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
0
0
0
Lei Zhang : user32: Add tests for edit controls and VK_TAB.
by Alexandre Julliard
08 Apr '08
08 Apr '08
Module: wine Branch: master Commit: 42d32aba0223dcf4a08b577a2b32f7f65cc3faaa URL:
http://source.winehq.org/git/wine.git/?a=commit;h=42d32aba0223dcf4a08b577a2…
Author: Lei Zhang <thestig(a)google.com> Date: Mon Apr 7 14:07:04 2008 -0700 user32: Add tests for edit controls and VK_TAB. --- dlls/user32/tests/edit.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 50 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 4ff294c..0eafc80 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1707,6 +1707,55 @@ static void test_enter(void) DestroyWindow (hwEdit); } +static void test_tab(void) +{ + HWND hwEdit; + LONG r; + char buffer[16]; + + /* multiline */ + hwEdit = create_editcontrol(ES_MULTILINE, 0); + r = get_edit_style(hwEdit); + ok(ES_MULTILINE == r, "Wrong style expected 0x%x got: 0x%x\n", ES_MULTILINE, r); + + /* set text */ + r = SendMessage(hwEdit , WM_SETTEXT, 0, (LPARAM) ""); + 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); + + /* 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); + + /* single line */ + hwEdit = create_editcontrol(0, 0); + r = get_edit_style(hwEdit); + ok(0 == r, "Wrong style expected 0x%x got: 0x%x\n", 0, r); + + /* set text */ + r = SendMessage(hwEdit , WM_SETTEXT, 0, (LPARAM) ""); + 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); + + /* get text */ + buffer[0] = 0; + r = SendMessage(hwEdit, WM_GETTEXT, 16, (LPARAM) buffer); + ok(0 == r, "Expected: %d, got len %d\n", 0, r); + ok(0 == strcmp(buffer, ""), "expected \"\", got \"%s\"\n", buffer); + + DestroyWindow (hwEdit); +} + static void test_edit_dialog(void) { int r; @@ -1932,6 +1981,7 @@ START_TEST(edit) test_espassword(); test_undo(); test_enter(); + test_tab(); test_edit_dialog(); test_multi_edit_dialog(); test_wantreturn_edit_dialog();
1
0
0
0
Lei Zhang : user32: Add tests for edit controls and VK_RETURN.
by Alexandre Julliard
08 Apr '08
08 Apr '08
Module: wine Branch: master Commit: d1abf27f8d3057131cf0bbc01bbfff121fdcb9c9 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d1abf27f8d3057131cf0bbc01…
Author: Lei Zhang <thestig(a)google.com> Date: Mon Apr 7 14:01:00 2008 -0700 user32: Add tests for edit controls and VK_RETURN. --- dlls/user32/tests/edit.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 70 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 9ca687b..4ff294c 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1638,6 +1638,75 @@ static void test_undo(void) DestroyWindow (hwEdit); } +static void test_enter(void) +{ + HWND hwEdit; + LONG r; + char buffer[16]; + + /* multiline */ + hwEdit = create_editcontrol(ES_MULTILINE, 0); + r = get_edit_style(hwEdit); + ok(ES_MULTILINE == r, "Wrong style expected 0x%x got: 0x%x\n", ES_MULTILINE, r); + + /* set text */ + r = SendMessage(hwEdit , WM_SETTEXT, 0, (LPARAM) ""); + ok(TRUE == r, "Expected: %d, got: %d\n", TRUE, r); + + r = SendMessage(hwEdit, WM_CHAR, VK_RETURN, 0); + todo_wine 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(2 == r, "Expected: %d, got len %d\n", 2, r); + ok(0 == strcmp(buffer, "\r\n"), "expected \"\\r\\n\", got \"%s\"\n", buffer); + } + + DestroyWindow (hwEdit); + + /* single line */ + hwEdit = create_editcontrol(0, 0); + r = get_edit_style(hwEdit); + ok(0 == r, "Wrong style expected 0x%x got: 0x%x\n", 0, r); + + /* set text */ + r = SendMessage(hwEdit , WM_SETTEXT, 0, (LPARAM) ""); + ok(TRUE == r, "Expected: %d, got: %d\n", TRUE, r); + + r = SendMessage(hwEdit, WM_CHAR, VK_RETURN, 0); + todo_wine ok(1 == r, "Expected: %d, got: %d\n", 1, r); + + /* get text */ + buffer[0] = 0; + r = SendMessage(hwEdit, WM_GETTEXT, 16, (LPARAM) buffer); + ok(0 == r, "Expected: %d, got len %d\n", 0, r); + ok(0 == strcmp(buffer, ""), "expected \"\", got \"%s\"\n", buffer); + + DestroyWindow (hwEdit); + + /* single line with ES_WANTRETURN */ + hwEdit = create_editcontrol(ES_WANTRETURN, 0); + r = get_edit_style(hwEdit); + ok(ES_WANTRETURN == r, "Wrong style expected 0x%x got: 0x%x\n", ES_WANTRETURN, r); + + /* set text */ + r = SendMessage(hwEdit , WM_SETTEXT, 0, (LPARAM) ""); + ok(TRUE == r, "Expected: %d, got: %d\n", TRUE, r); + + r = SendMessage(hwEdit, WM_CHAR, VK_RETURN, 0); + todo_wine ok(1 == r, "Expected: %d, got: %d\n", 1, r); + + /* get text */ + buffer[0] = 0; + r = SendMessage(hwEdit, WM_GETTEXT, 16, (LPARAM) buffer); + ok(0 == r, "Expected: %d, got len %d\n", 0, r); + ok(0 == strcmp(buffer, ""), "expected \"\", got \"%s\"\n", buffer); + + DestroyWindow (hwEdit); +} + static void test_edit_dialog(void) { int r; @@ -1862,6 +1931,7 @@ START_TEST(edit) test_text_position(); test_espassword(); test_undo(); + test_enter(); test_edit_dialog(); test_multi_edit_dialog(); test_wantreturn_edit_dialog();
1
0
0
0
Lei Zhang : user32: Add more tests for single line edit control inside a dialog.
by Alexandre Julliard
08 Apr '08
08 Apr '08
Module: wine Branch: master Commit: e91de3952191b1a5775b00adb62d5ef320b3d01f URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e91de3952191b1a5775b00adb…
Author: Lei Zhang <thestig(a)google.com> Date: Mon Apr 7 13:32:36 2008 -0700 user32: Add more tests for single line edit control inside a dialog. --- dlls/user32/tests/edit.c | 182 +++++++++++++++++++++++++++++++++++++++++ dlls/user32/tests/resource.rc | 20 +++++ 2 files changed, 202 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index c226131..9ca687b 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -284,6 +284,134 @@ static INT_PTR CALLBACK edit_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPA return FALSE; } +static INT_PTR CALLBACK edit_singleline_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_INITDIALOG: + { + HWND hedit = GetDlgItem(hdlg, 1000); + SetFocus(hedit); + switch (lparam) + { + /* test cases for WM_KEYDOWN */ + case 0: + PostMessage(hedit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + break; + case 1: + PostMessage(hedit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + /* needed so the test does not wait for user input */ + PostMessage(hdlg, WM_USER, 0xfeedbeef, 0); + break; + case 2: + PostMessage(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 1); + break; + + /* test cases for WM_CHAR */ + case 3: + PostMessage(hedit, WM_CHAR, VK_ESCAPE, 0x10001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 4: + PostMessage(hedit, WM_CHAR, VK_RETURN, 0x1c0001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 5: + PostMessage(hedit, WM_CHAR, VK_TAB, 0xf0001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 0); + break; + + /* test cases for WM_KEYDOWN + WM_CHAR */ + case 6: + PostMessage(hedit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + PostMessage(hedit, WM_CHAR, VK_ESCAPE, 0x10001); + break; + case 7: + PostMessage(hedit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + PostMessage(hedit, WM_CHAR, VK_RETURN, 0x1c0001); + /* needed so the test does not wait for user input */ + PostMessage(hdlg, WM_USER, 0xfeedbeef, 0); + break; + case 8: + PostMessage(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessage(hedit, WM_CHAR, VK_TAB, 0xf0001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 1); + break; + + default: + break; + } + break; + } + + case WM_COMMAND: + if (HIWORD(wparam) != BN_CLICKED) + break; + + switch (LOWORD(wparam)) + { + case IDOK: + EndDialog(hdlg, 111); + break; + + case IDCANCEL: + EndDialog(hdlg, 222); + break; + + default: + break; + } + break; + + case WM_USER: + { + HWND hok = GetDlgItem(hdlg, IDOK); + HWND hedit = GetDlgItem(hdlg, 1000); + HWND hfocus = GetFocus(); + int len = SendMessage(hedit, WM_GETTEXTLENGTH, 0, 0); + + if (wparam == 0xfeedbeef) + { + EndDialog(hdlg, 66); + break; + } + if (wparam != 0xdeadbeef) + break; + + switch (lparam) + { + case 0: + if ((hfocus == hedit) && len == 0) + EndDialog(hdlg, 444); + else + EndDialog(hdlg, 555); + break; + + case 1: + if ((hfocus == hok) && len == 0) + EndDialog(hdlg, 444); + else + EndDialog(hdlg, 555); + break; + + default: + EndDialog(hdlg, 55); + } + break; + } + + case WM_CLOSE: + EndDialog(hdlg, 333); + break; + + default: + break; + } + + return FALSE; +} + static INT_PTR CALLBACK edit_wantreturn_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) { switch (msg) @@ -1613,6 +1741,59 @@ static void test_wantreturn_edit_dialog(void) ok(444 == r, "Expected %d, got %d\n", 444, r); } +static void test_singleline_wantreturn_edit_dialog(void) +{ + int r; + + /* tests for WM_KEYDOWN */ + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 0); + todo_wine ok(222 == r, "Expected %d, got %d\n", 222, r); + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 1); + ok(111 == r, "Expected %d, got %d\n", 111, r); + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 2); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_CHAR */ + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 3); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 4); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 5); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_KEYDOWN + WM_CHAR */ + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 6); + todo_wine ok(222 == r, "Expected %d, got %d\n", 222, r); + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 7); + ok(111 == r, "Expected %d, got %d\n", 111, r); + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 8); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_KEYDOWN */ + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 0); + todo_wine ok(222 == r, "Expected %d, got %d\n", 222, r); + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 1); + todo_wine ok(111 == r, "Expected %d, got %d\n", 111, r); + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 2); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_CHAR */ + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 3); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 4); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 5); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_KEYDOWN + WM_CHAR */ + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 6); + todo_wine ok(222 == r, "Expected %d, got %d\n", 222, r); + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 7); + todo_wine ok(111 == r, "Expected %d, got %d\n", 111, r); + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 8); + ok(444 == r, "Expected %d, got %d\n", 444, r); +} + static BOOL RegisterWindowClasses (void) { WNDCLASSA test2; @@ -1684,6 +1865,7 @@ START_TEST(edit) test_edit_dialog(); test_multi_edit_dialog(); test_wantreturn_edit_dialog(); + test_singleline_wantreturn_edit_dialog(); UnregisterWindowClasses(); } diff --git a/dlls/user32/tests/resource.rc b/dlls/user32/tests/resource.rc index 833797d..7da8a6c 100644 --- a/dlls/user32/tests/resource.rc +++ b/dlls/user32/tests/resource.rc @@ -118,6 +118,26 @@ FONT 8, "MS Shell Dlg" EDITTEXT 1000, 5, 5, 150, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_MULTILINE | WS_VSCROLL | ES_AUTOVSCROLL } +EDIT_SINGLELINE_DIALOG DIALOG DISCARDABLE 0, 0, 160, 80 +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER +CAPTION "Edit Test" +FONT 8, "MS Shell Dlg" +{ + PUSHBUTTON "Ok", IDOK, 20, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 100, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 1000, 5, 5, 150, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | ES_AUTOVSCROLL +} + +EDIT_SINGLELINE_WANTRETURN_DIALOG DIALOG DISCARDABLE 0, 0, 160, 80 +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER +CAPTION "Edit Test" +FONT 8, "MS Shell Dlg" +{ + PUSHBUTTON "Ok", IDOK, 20, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 100, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 1000, 5, 5, 150, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | ES_AUTOVSCROLL | ES_WANTRETURN +} + EDIT_WANTRETURN_DIALOG DIALOG DISCARDABLE 0, 0, 160, 80 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER CAPTION "Edit Test"
1
0
0
0
Lei Zhang : user32: Add more tests for ES_WANTRETURN.
by Alexandre Julliard
08 Apr '08
08 Apr '08
Module: wine Branch: master Commit: 8cf7eef073955e825a675485234b7ef1d6f00cea URL:
http://source.winehq.org/git/wine.git/?a=commit;h=8cf7eef073955e825a6754852…
Author: Lei Zhang <thestig(a)google.com> Date: Mon Apr 7 13:32:20 2008 -0700 user32: Add more tests for ES_WANTRETURN. --- dlls/user32/tests/edit.c | 159 +++++++++++++++++++++++++++++++++++++++++ dlls/user32/tests/resource.rc | 10 +++ 2 files changed, 169 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 0e9487d..c226131 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -284,6 +284,135 @@ static INT_PTR CALLBACK edit_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPA return FALSE; } +static INT_PTR CALLBACK edit_wantreturn_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_INITDIALOG: + { + HWND hedit = GetDlgItem(hdlg, 1000); + SetFocus(hedit); + switch (lparam) + { + /* test cases for WM_KEYDOWN */ + case 0: + PostMessage(hedit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + break; + case 1: + PostMessage(hedit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 2: + PostMessage(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 1); + break; + + /* test cases for WM_CHAR */ + case 3: + PostMessage(hedit, WM_CHAR, VK_ESCAPE, 0x10001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 4: + PostMessage(hedit, WM_CHAR, VK_RETURN, 0x1c0001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 2); + break; + case 5: + PostMessage(hedit, WM_CHAR, VK_TAB, 0xf0001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 0); + break; + + /* test cases for WM_KEYDOWN + WM_CHAR */ + case 6: + PostMessage(hedit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + PostMessage(hedit, WM_CHAR, VK_ESCAPE, 0x10001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 7: + PostMessage(hedit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + PostMessage(hedit, WM_CHAR, VK_RETURN, 0x1c0001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 2); + break; + case 8: + PostMessage(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessage(hedit, WM_CHAR, VK_TAB, 0xf0001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 1); + break; + + default: + break; + } + break; + } + + case WM_COMMAND: + if (HIWORD(wparam) != BN_CLICKED) + break; + + switch (LOWORD(wparam)) + { + case IDOK: + EndDialog(hdlg, 111); + break; + + case IDCANCEL: + EndDialog(hdlg, 222); + break; + + default: + break; + } + break; + + case WM_USER: + { + HWND hok = GetDlgItem(hdlg, IDOK); + HWND hedit = GetDlgItem(hdlg, 1000); + HWND hfocus = GetFocus(); + int len = SendMessage(hedit, WM_GETTEXTLENGTH, 0, 0); + + if (wparam != 0xdeadbeef) + break; + + switch (lparam) + { + case 0: + if ((hfocus == hedit) && len == 0) + EndDialog(hdlg, 444); + else + EndDialog(hdlg, 555); + break; + + case 1: + if ((hfocus == hok) && len == 0) + EndDialog(hdlg, 444); + else + EndDialog(hdlg, 555); + break; + + case 2: + if ((hfocus == hedit) && len == 2) + EndDialog(hdlg, 444); + else + EndDialog(hdlg, 555); + break; + + default: + EndDialog(hdlg, 55); + } + break; + } + + case WM_CLOSE: + EndDialog(hdlg, 333); + break; + + default: + break; + } + + return FALSE; +} + static HINSTANCE hinst; static HWND hwndET2; static const char szEditTest2Class[] = "EditTest2Class"; @@ -1455,6 +1584,35 @@ static void test_multi_edit_dialog(void) ok(11 == r, "Expected %d, got %d\n", 11, r); } +static void test_wantreturn_edit_dialog(void) +{ + int r; + + /* tests for WM_KEYDOWN */ + r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 0); + ok(333 == r, "Expected %d, got %d\n", 333, r); + r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 1); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 2); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_CHAR */ + r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 3); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 4); + todo_wine ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 5); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_KEYDOWN + WM_CHAR */ + r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 6); + todo_wine ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 7); + todo_wine ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 8); + ok(444 == r, "Expected %d, got %d\n", 444, r); +} + static BOOL RegisterWindowClasses (void) { WNDCLASSA test2; @@ -1525,6 +1683,7 @@ START_TEST(edit) test_undo(); test_edit_dialog(); test_multi_edit_dialog(); + test_wantreturn_edit_dialog(); UnregisterWindowClasses(); } diff --git a/dlls/user32/tests/resource.rc b/dlls/user32/tests/resource.rc index 80abf08..833797d 100644 --- a/dlls/user32/tests/resource.rc +++ b/dlls/user32/tests/resource.rc @@ -118,6 +118,16 @@ FONT 8, "MS Shell Dlg" EDITTEXT 1000, 5, 5, 150, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_MULTILINE | WS_VSCROLL | ES_AUTOVSCROLL } +EDIT_WANTRETURN_DIALOG DIALOG DISCARDABLE 0, 0, 160, 80 +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER +CAPTION "Edit Test" +FONT 8, "MS Shell Dlg" +{ + PUSHBUTTON "Ok", IDOK, 20, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 100, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 1000, 5, 5, 150, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_MULTILINE | WS_VSCROLL | ES_AUTOVSCROLL | ES_WANTRETURN +} + EDIT_READONLY_DIALOG DIALOG DISCARDABLE 0, 0, 160, 80 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER CAPTION "Edit Readonly Test"
1
0
0
0
← Newer
1
...
91
92
93
94
95
96
97
...
128
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
Results per page:
10
25
50
100
200