Huw Davies : riched20:
Add some test for EM_GETTEXTLENGTHEX and fix the single line edit
cases.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Aug 16 05:38:29 CDT 2007
Module: wine
Branch: master
Commit: 0dcebea44d97714c04355f6bff55800eb3a58dd7
URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dcebea44d97714c04355f6bff55800eb3a58dd7
Author: Huw Davies <huw at codeweavers.com>
Date: Wed Aug 15 14:47:17 2007 +0100
riched20: Add some test for EM_GETTEXTLENGTHEX and fix the single line edit cases.
---
dlls/riched20/caret.c | 4 +-
dlls/riched20/tests/editor.c | 67 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 69 insertions(+), 2 deletions(-)
diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c
index 24b65c0..f38f700 100644
--- a/dlls/riched20/caret.c
+++ b/dlls/riched20/caret.c
@@ -57,8 +57,8 @@ int ME_GetTextLengthEx(ME_TextEditor *editor, const GETTEXTLENGTHEX *how)
return E_INVALIDARG;
length = ME_GetTextLength(editor);
-
- if (how->flags & GTL_USECRLF)
+
+ if ((GetWindowLongW(editor->hWnd, GWL_STYLE) & ES_MULTILINE) && (how->flags & GTL_USECRLF))
length += editor->nParagraphs;
if (how->flags & GTL_NUMBYTES)
diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c
index b20e719..1f1e809 100644
--- a/dlls/riched20/tests/editor.c
+++ b/dlls/riched20/tests/editor.c
@@ -1823,6 +1823,72 @@ static void test_unicode_conversions(void)
DestroyWindow(hwnd);
}
+
+static void test_EM_GETTEXTLENGTHEX(void)
+{
+ HWND hwnd;
+ GETTEXTLENGTHEX gtl;
+ int ret;
+
+ /* single line */
+ hwnd = CreateWindowExA(0, "RichEdit20W", NULL, WS_POPUP,
+ 0, 0, 200, 60, 0, 0, 0, 0);
+ ok(hwnd != 0, "CreateWindowExA error %u\n", GetLastError());
+
+ gtl.flags = GTL_NUMCHARS | GTL_PRECISE | GTL_USECRLF;
+ gtl.codepage = CP_ACP;
+ ret = SendMessageA(hwnd, EM_GETTEXTLENGTHEX, (WPARAM)>l, 0);
+ ok(ret == 0, "ret %d\n",ret);
+
+ gtl.flags = GTL_NUMCHARS | GTL_PRECISE;
+ gtl.codepage = CP_ACP;
+ ret = SendMessageA(hwnd, EM_GETTEXTLENGTHEX, (WPARAM)>l, 0);
+ ok(ret == 0, "ret %d\n",ret);
+
+ SendMessage(hwnd, WM_SETTEXT, 0, (LPARAM) "a\nb\n\n\r\n");
+
+ gtl.flags = GTL_NUMCHARS | GTL_PRECISE | GTL_USECRLF;
+ gtl.codepage = CP_ACP;
+ ret = SendMessageA(hwnd, EM_GETTEXTLENGTHEX, (WPARAM)>l, 0);
+ todo_wine ok(ret == 1, "ret %d\n",ret);
+
+ gtl.flags = GTL_NUMCHARS | GTL_PRECISE;
+ gtl.codepage = CP_ACP;
+ ret = SendMessageA(hwnd, EM_GETTEXTLENGTHEX, (WPARAM)>l, 0);
+ todo_wine ok(ret == 1, "ret %d\n",ret);
+
+ DestroyWindow(hwnd);
+
+ /* multi line */
+ hwnd = CreateWindowExA(0, "RichEdit20W", NULL, WS_POPUP | ES_MULTILINE,
+ 0, 0, 200, 60, 0, 0, 0, 0);
+ ok(hwnd != 0, "CreateWindowExA error %u\n", GetLastError());
+
+ gtl.flags = GTL_NUMCHARS | GTL_PRECISE | GTL_USECRLF;
+ gtl.codepage = CP_ACP;
+ ret = SendMessageA(hwnd, EM_GETTEXTLENGTHEX, (WPARAM)>l, 0);
+ todo_wine ok(ret == 0, "ret %d\n",ret);
+
+ gtl.flags = GTL_NUMCHARS | GTL_PRECISE;
+ gtl.codepage = CP_ACP;
+ ret = SendMessageA(hwnd, EM_GETTEXTLENGTHEX, (WPARAM)>l, 0);
+ ok(ret == 0, "ret %d\n",ret);
+
+ SendMessage(hwnd, WM_SETTEXT, 0, (LPARAM) "a\nb\n\n\r\n");
+
+ gtl.flags = GTL_NUMCHARS | GTL_PRECISE | GTL_USECRLF;
+ gtl.codepage = CP_ACP;
+ ret = SendMessageA(hwnd, EM_GETTEXTLENGTHEX, (WPARAM)>l, 0);
+ todo_wine ok(ret == 10, "ret %d\n",ret);
+
+ gtl.flags = GTL_NUMCHARS | GTL_PRECISE;
+ gtl.codepage = CP_ACP;
+ ret = SendMessageA(hwnd, EM_GETTEXTLENGTHEX, (WPARAM)>l, 0);
+ ok(ret == 6, "ret %d\n",ret);
+
+ DestroyWindow(hwnd);
+}
+
START_TEST( editor )
{
MSG msg;
@@ -1855,6 +1921,7 @@ START_TEST( editor )
test_EM_StreamIn_Undo();
test_EM_FORMATRANGE();
test_unicode_conversions();
+ test_EM_GETTEXTLENGTHEX();
/* Set the environment variable WINETEST_RICHED20 to keep windows
* responsive and open for 30 seconds. This is useful for debugging.
More information about the wine-cvs
mailing list