- David Hedberg Fix return value for EDIT_EM_Scroll and case where EM_SCROLL with page down results in trying to scroll up past the beginning. Sync to wine 1.1.40.

svn path=/trunk/; revision=46013
This commit is contained in:
James Tabor 2010-03-08 21:24:47 +00:00
parent 8b48dd5b7c
commit d89923519b
2 changed files with 7 additions and 4 deletions

View file

@ -1648,13 +1648,16 @@ static LRESULT EDIT_EM_Scroll(EDITSTATE *es, INT action)
INT vlc = get_vertical_line_count(es);
/* check if we are going to move too far */
if(es->y_offset + dy > es->line_count - vlc)
dy = es->line_count - vlc - es->y_offset;
dy = max(es->line_count - vlc, 0) - es->y_offset;
/* Notification is done in EDIT_EM_LineScroll */
if(dy)
if(dy) {
EDIT_EM_LineScroll(es, 0, dy);
return MAKELONG((SHORT)dy, (BOOL)TRUE);
}
}
return MAKELONG((SHORT)dy, (BOOL)TRUE);
return (LRESULT)FALSE;
}

View file

@ -232,7 +232,7 @@ snmpapi -
User32 -
reactos/dll/win32/user32/controls/button.c # Synced to Wine-1_1_39
reactos/dll/win32/user32/controls/combo.c # Synced to Wine-1_1_39
reactos/dll/win32/user32/controls/edit.c # Synced to Wine-1_1_39
reactos/dll/win32/user32/controls/edit.c # Synced to Wine-1_1_40
reactos/dll/win32/user32/controls/icontitle.c # Synced to Wine-1_1_39
reactos/dll/win32/user32/controls/listbox.c # Synced to Wine-1_1_39
reactos/dll/win32/user32/controls/scrollbar.c # Forked