Alex Villacís Lasso : richedit: Revert patch that introduced a test that fails on all platforms.
Alexandre Julliard
julliard at winehq.org
Wed Jun 25 04:47:39 CDT 2008
Module: wine
Branch: master
Commit: 163e9d1d02bdef36a63b31122939787f146f9ca0
URL: http://source.winehq.org/git/wine.git/?a=commit;h=163e9d1d02bdef36a63b31122939787f146f9ca0
Author: Alex Villacís Lasso <a_villacis at palosanto.com>
Date: Tue Jun 24 13:25:52 2008 -0500
richedit: Revert patch that introduced a test that fails on all platforms.
---
dlls/riched20/paint.c | 9 ++-------
dlls/riched20/tests/editor.c | 10 ----------
2 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c
index 88576f6..95befbc 100644
--- a/dlls/riched20/paint.c
+++ b/dlls/riched20/paint.c
@@ -674,14 +674,9 @@ void ME_Scroll(ME_TextEditor *editor, int value, int type)
si.fMask |= SIF_DISABLENOSCROLL;
si.nMin = 0;
+ si.nMax = editor->nTotalLength;
- if (ME_GetTextLength(editor) > 0)
- {
- si.nMax = editor->nTotalLength;
- si.nPage = editor->sizeWindow.cy;
- } else {
- si.nMax = si.nPage = 0;
- }
+ si.nPage = editor->sizeWindow.cy;
TRACE("min=%d max=%d page=%d\n", si.nMin, si.nMax, si.nPage);
SetScrollInfo(hWnd, SB_VERT, &si, TRUE);
diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c
index 68e1d7e..bbdba4d 100644
--- a/dlls/riched20/tests/editor.c
+++ b/dlls/riched20/tests/editor.c
@@ -2038,16 +2038,6 @@ static void test_EM_SCROLL(void)
int expr; /* expected return value */
HWND hwndRichEdit = new_richedit(NULL);
int y_before, y_after; /* units of lines of text */
- SCROLLINFO si;
-
- /* Empty richedit should have scroll range of 0 */
- si.cbSize = sizeof(si);
- si.fMask = SIF_RANGE | SIF_PAGE | SIF_POS;
- GetScrollInfo(hwndRichEdit, SB_VERT, &si);
- ok(si.nMin == 0, "si.nMin == %d, expected 0\n", si.nMin);
- ok(si.nMax == 0, "si.nMax == %d, expected 0\n", si.nMax);
- ok(si.nPos == 0, "si.nPos == %d, expected 0\n", si.nPos);
- ok(si.nPage == 0, "si.nPage == %d, expected 0\n", si.nPage);
/* test a richedit box containing a single line of text */
SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) "a");/* one line of text */
More information about the wine-cvs
mailing list