[PATCH 2/4] user32/edit: Fix incorrect size for format rect when it is smaller than text.

[Jacob Czekalla]

From: Jacob Czekalla

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56873
---
 dlls/user32/edit.c       | 25 ++++++++++++++++++++++++-
 dlls/user32/tests/edit.c |  8 ++++----
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c
index 39f429813d6..a57defea971 100644
--- a/dlls/user32/edit.c
+++ b/dlls/user32/edit.c
@@ -2307,6 +2307,26 @@ static void EDIT_AdjustFormatRect(EDITSTATE *es)
    EDIT_SetCaretPos(es, es->selection_end, es->flags & EF_AFTER_WRAP);
 }

+static int EDIT_is_valid_format_rect(EDITSTATE *es, const RECT *rc)
+{
+	RECT edit_rect;
+	int text_height = es->line_height * es->line_count;
+
+	GetClientRect(es->hwndSelf, &edit_rect);
+	if (rc->bottom == 0 && rc->top == 0 && rc->right == 0 && rc->left == 0)
+		return 0;
+	if (rc->top >= rc->bottom)
+		return 0;
+	if (rc->left >= rc->right)
+		return 0;
+	if (text_height > (rc->bottom - rc->top))
+		return 0;
+	if (es->text_width > (rc->right - rc->left))
+		return 0;
+	if ((rc->bottom - rc->top) > (edit_rect.bottom - edit_rect.top))
+		return 0;
+	return 1;
+}

/*********************************************************************
  *
@@ -2322,7 +2342,10 @@ static void EDIT_SetRectNP(EDITSTATE *es, const RECT *rc)
    INT bw, bh;
    ExStyle = GetWindowLongPtrW(es->hwndSelf, GWL_EXSTYLE);
    
-	CopyRect(&es->format_rect, rc);
+	if (!EDIT_is_valid_format_rect(es, rc))
+		GetClientRect(es->hwndSelf, &es->format_rect);
+	else
+		CopyRect(&es->format_rect, rc);
    
    if (ExStyle & WS_EX_CLIENTEDGE) {
    	es->format_rect.left++;
diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c
index 6a769368fe9..b92c40af3d8 100644
--- a/dlls/user32/tests/edit.c
+++ b/dlls/user32/tests/edit.c
@@ -3454,10 +3454,10 @@ static void test_small_rect(void)
         SetWindowTextA(edit, "Test Test Test\r\n\r\nTest Test Test Test Test Test Test Test Test Test Test Test\r\n\r\nTest Test Test");
         SendMessageA(edit, EM_SETRECT, 0, (LPARAM)&tests[i].input);
         SendMessageA(edit, EM_GETRECT, 0, (LPARAM)&rc);
-        todo_wine ok(rc.left == correct.left, "left(%d): Expected %ld, got %ld\n", i, correct.left, rc.left);
-        todo_wine ok(rc.top == correct.top, "top(%d): Expected %ld, got %ld\n", i, correct.top, rc.top);
-        todo_wine ok(rc.right == correct.right, "right(%d): Expected %ld, got %ld\n", i, correct.right, rc.right);
-        todo_wine ok(rc.bottom == correct.bottom, "bottom(%d): Expected %ld, got %ld\n", i, correct.bottom, rc.bottom);
+        ok(rc.left == correct.left, "left(%d): Expected %ld, got %ld\n", i, correct.left, rc.left);
+        ok(rc.top == correct.top, "top(%d): Expected %ld, got %ld\n", i, correct.top, rc.top);
+        ok(rc.right == correct.right, "right(%d): Expected %ld, got %ld\n", i, correct.right, rc.right);
+        ok(rc.bottom == correct.bottom, "bottom(%d): Expected %ld, got %ld\n", i, correct.bottom, rc.bottom);
         DestroyWindow(edit);
     }
 }