user32: Fix return value of EDIT_EM_Scroll.

diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c
index 0c9287cc0a8c04a0a126f2b5805bd4400fa978ce..35f828539398802183810046260a72e7a69e72b4 100644 (file)
--- a/dlls/user32/edit.c
+++ b/dlls/user32/edit.c
@@ -1635,10 +1635,13 @@ static LRESULT EDIT_EM_Scroll(EDITSTATE *es, INT action)
                dy = es->line_count - vlc - es->y_offset;
 
            /* Notification is done in EDIT_EM_LineScroll */
-           if(dy)
+           if(dy) {
                EDIT_EM_LineScroll(es, 0, dy);
+               return MAKELONG(dy, TRUE);
+           }
+
        }
-       return MAKELONG(dy, TRUE);
+       return (LRESULT)FALSE;
 }
 
 

diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c
index 7ecee13b80a518f8f1a3cd5c9c872e2646cced0c..6d3afb8ee89213c01126249b0e3057e9ac863198 100644 (file)
--- a/dlls/user32/tests/edit.c
+++ b/dlls/user32/tests/edit.c
@@ -1316,6 +1316,40 @@ static void test_edit_control_limittext(void)
     DestroyWindow(hwEdit);
 }
 
+/* Test EM_SCROLL */
+static void test_edit_control_scroll(void)
+{
+    static const char *single_line_str = "a";
+    HWND hwEdit;
+    LONG ret;
+
+    /* Check the return value when EM_SCROLL doesn't scroll
+     * anything. Should not return true unless any lines were actually
+     * scrolled. */
+    hwEdit = CreateWindow(
+              "EDIT",
+              single_line_str,
+              WS_VSCROLL | ES_MULTILINE,
+              1, 1, 100, 100,
+              NULL, NULL, hinst, NULL);
+
+    assert(hwEdit);
+
+    ret = SendMessage(hwEdit, EM_SCROLL, SB_PAGEDOWN, 0);
+    ok(!ret, "Returned %x, expected 0.\n", ret);
+
+    ret = SendMessage(hwEdit, EM_SCROLL, SB_PAGEUP, 0);
+    ok(!ret, "Returned %x, expected 0.\n", ret);
+
+    ret = SendMessage(hwEdit, EM_SCROLL, SB_LINEUP, 0);
+    ok(!ret, "Returned %x, expected 0.\n", ret);
+
+    ret = SendMessage(hwEdit, EM_SCROLL, SB_LINEDOWN, 0);
+    ok(!ret, "Returned %x, expected 0.\n", ret);
+
+    DestroyWindow (hwEdit);
+}
+
 static void test_margins(void)
 {
     HWND hwEdit;
@@ -2319,6 +2353,7 @@ START_TEST(edit)
     test_edit_control_5();
     test_edit_control_6();
     test_edit_control_limittext();
+    test_edit_control_scroll();
     test_margins();
     test_margins_font_change();
     test_text_position();