[jimtabor] 46013: [User32] - 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.

Author: jimtabor
Date: Mon Mar  8 22:24:47 2010
New Revision: 46013

URL: http://svn.reactos.org/svn/reactos?rev=46013&view=rev
Log:
[User32]
- 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.

Modified:
    trunk/reactos/dll/win32/user32/controls/edit.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/user32/controls/edit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/…
==============================================================================
--- trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] Mon Mar  8 22:24:47 2010
@@ -1648,13 +1648,16 @@
 	    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;
 }
 
 

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Mar  8 22:24:47 2010
@@ -232,7 +232,7 @@
 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